A possibility would be to play with 5 the "white octaves" and use 4 for "black octaves".
Anyone tried using the third finger for the F sharp? This seems to allow smooth passage to and from the 2 G sharp in between, for which I use the fourth finger.