I thought the headlamp surrounds were stainless steel? They seem to be S/S on my car (2005 4/4). It is possible to buy S/S headlamp rims, that would be a permanent cure.
One area I had a little rust beginning to form was inside the bonnet piano hinge, which is carbon steel. I filled it with ACF-50 following advice on this forum, and no rust since. It seems to be very effective indeed, and as it's less "waxy" than waxoyl, it seems to penetrate better, though of course then it remains "oily" so not suitable for every type of surface.
http://www.acf-50.co.uk/motorcycle.htmNigel
