When I learned this prelude my teacher and I looked at about 10 different versions. We first decided to stick to the D arrangements with the dropped D in the bass. That eliminated some scores. Then we looked at various fingerings and chose the arrangement made by Per-Olov Kindgren as the one that we liked the best. [I told KIndgren and he was pleased.
But even then, just like Mike above, in some measures I borrowed fingerings from other people. My model to follow was the performance of John Feeley on YT, which I think is excellent. When I finally acquired his score, I was already too advanced in my study of the prelude and I didn't want to make too many drastic changes.
One more thing: I think I learned a lot about this Prelude while listening to the original cello version of it.
By the way, I also like the G# on measure 6 a lot.