Andy,
Firstly I am Soooo glad you managed to get the car back... once all the paperwork has been sorted you need to name and shame to ensure that no-one else is subjected to the same pain that you have experienced.
If im bruitally honest I would just strip the bits off that can be removed, bumpers skirts arches etc and reattach yourself making sure everything else is lined up correctly. Although its a pain in the a$$ you will know its right yourself and also will give you that sense of pride. plus it will make good reading on this project thread
I do like the orginal big ball mods you have done, smooth ariel indicators and wipers. Takes balls to do that but the end result will no-doubt be amazing! No doubt your'll be fighting off the magazine shoots left right and centre when its done!
One thing to note, especially when you are investing so much money is how the finish will be, even with millions of pounds thrown at a car, if the fit isnt right or the lines dont match, the car is worthless and looks worse than when you started. More often than not the only way to achieve this is to actualy to do it yourself. Hey think of the positives, at least no-one can acuse you a having a 'chequebook car'
I'll more than happily come down and pass you spanners/make the odd brew on the weekend if you want mate.
Dan