Thank you gents. Once you have owned a car with xenons there is no going back to halogen headlights. Night and day difference, pun intended.
As far as the diesel conversion goes, finding the right donor car is nigh on impossible, autos come up alot but I'm avoiding them as it has to be manual 6spd.
Not to mention there are 3 buyers wanting the car but want it in 325i trim so this may just become a restomod. I do however have another M54B30 that I can assemble and drop in there...