just fitted two new headlights on joycee. Full kit, inners etc. ( £70) If you have right-hand lenses, HERITAGE are selling new lamps with left-hand lenses for £35, each. (£95 r/h ones) just swap the left hand lenses for your right-hand ones. Worked for me
http://www.vwheritage.com/vw_parts_Headlights-and-switches_act_page.render_pageID_326_lang_EN_country_GB.htm try that, i'm rubbish with links etc