Sorry to jump in and please dont get me wrong, but if you say, that you have to keep momentum and can not hover without moving, to me that means that your buoyancy is far from "perfect". So even if during the freshwater dives you wont experience current you could focus on working on trim and buoyancy until you can stay (almost) perfectly still.
Not having been in other parts of Indo then Bali, I have to say that while I thought this was nice I definitely prefer diving the Red Sea, especially the southern part (St. Johns etc.)
Quite so on the bouyancy part, Rechno!