OK, that's all clear, thanks for the replies.
So, it would seem that I can change my "old" headlamps for the newer "shaded" ones, as a straight swap, the indicators are different (as I can see now) but I can buy clear indicators to fit.
Am a bit gutted about the grill and bumper, but never...