The best advise I can give (I used to instruct day and night land navigation) is to trust the compass and refer to it early and often...kinds like equalizing.
On land, people tend to drift in the direction of their dominant hand. Right handers will veer off to the right, lefties to the left. Some more than others.
Underwater we have to deal with surge (not REALLY an issue, cause if it pushes you 3 ft left, it should bring you 3 ft back to the right), current (cross-currents, especially the very mild ones that you don't think are moving you,have even gottem me off course a couple of times.
For night nav, which is limited viz, either watch the compass and look up every now and then, which is backwards from what most people do, OR shoot the azimuth, find a reference point as far ahead as you can see, whether this is 5 ft or 50 ft, and walk(swim in this case) to it, stop, check your compas, shoot another azimuth, pick another point up there and go directly to IT, repeat this untill you at where you wanted to be.
I've seen this done with students in OW and I thought it was great. On the beach, killing time between dives, the instructor gave everyone a compass so they didn't have to un-do theirs. He then had them shoot azimuth to a light pole a couple of hundred feet away. He was standing behind them so he had them turn around and face him while he breifed them some more. Then he had them put their towel over their head so it covered their face from being able to look forward, THEN turn around while looking down at the compass until they thougth they were faceing the azimuth to the pole. Then they could look up and see if they were right. It was a great exersize I thought and was a pretty good confidence builder.
I wouldn't recomend doing this in your front yard in plain view of all you neighbors, but maybe in the back yard....