gday mate,
well my lenses r screwed as well with that yellow tinge, so i was doing a bit of homework and there is heaps of these joints around
http://www.skyetrading.com/services.aspx
i called him a while back, i cant remember if it is $170 per headlight changeover, or $170 both headlights changeover.
if ur in vic give him a try, if ur not theres bound to be someone near ya.
worst case $340, beats 2k..
good luck