I snapped up @Lucan's Xenons on trademe a while back. After abit of wet sanding and buffing they are in pretty good shape. Installed without having to be coded in too which was cool. Looking forward to going for a drive in the dark now.
I also finally put the last two heat shields back on and after checking for oil leaks since the major overhaul (bone dry) put the splash guard back on.