If you can't find genuine anni lights fk automotive do anni style ones for about 90quid. Or you could have a go at splitting yours apart and doing the joey mod.
Fk also do a set of projector headlights without the halo/ angel eye. So it looks more like OEM r32 lights. Have a look around to see what it is you want.