Progress has been pretty slow, as work has been really busy and back away travelling a lot again.
With the car now back in the garage, I have done some test fitting of the windscreen and lights. It makes a dramatic difference putting the windscreen on, but from what I have read it could take some time to actually fit it.