I'm surprised nobody mentioned the adjusters. I just bought a (2000) Millennium edition, and thought I'd search on the topic. I used to have a black 2000 edition 1.7 a few years back. I had similar issues, and was using the high beam on low angle for a while, until I realised a way round it. The headlight projector/bulb assemblies (clusters) all have individual trimmer adjustments in the cluster, for each beam.

Look from the top, and you can see holes with a symbol. On the standard beam; I found I needed to raise them by a few turns (I think about 5-6 half turns). Makes a world of difference. In those days I had some slightly whiter 5W higher rated bulbs. Used the yellowish rain cutters for the fogs.

This time round, I think I'll do the HID upgrade as well, on the standard beams. I've heard from a few MOT testers, that with original projector assemblies; as long as the light pattern is still basically ok (usually the case with projectors because less affected by light source changes in comparison to a standard bulb in a parabolic dish configuration), they would not really be aware that the light is now HID. It would be tested as a standard headlight, and therefore will pass - but make sure if fitting them, that the light pattern thrown is basically correct and not insanely powerful HIDs, or you will obviously be dazzling others!