Mark,
I live in Edinburgh so this could be the answer.
I just had a fitting (this Monday) with Kurt Mungall the pro at Lothianburn Golf Club up near the ski slope in edinburgh. Here is his website www.customfittinggolf.com
Basically he can mod your exsiting clubs or sell you any of the top names. His shop is loaded to the barrells with Callaway, PING, Mizuno, Titleist and Cobra. He is a certified seller and fitter for all these makes and to be honest knows his apples.
I went in with a set of MP60s I have had a few months but could never really hit well. After an hour of fitting - turns out I need 3* upright and regular shafts, mine were flat and stiff shafts!!
At no point did he try to give the hard sell, he just professionally went about his business giving me the best advice and prices for sorting my exisitng clubs. He also sorted out my putter lie and loft and gave me a bit of a putting lesson.
Really nice bloke and after thinking about it and realising altering and adjusting was going to cost near on a new set I decided to get a brand new set of MP52s and wedges,
So £670 later I have a new set of clubs which are fitted for me and despite the dent in the wallet I'm looking forward to them arriving and couldn't recommend this guy anyomore.
Thinking about a new driver now - chances are rather than go to the usual outlets or my on pro I'll goup and see him.
Hopefully this helps, I definetly think you should give him a call, he is competitive in terms of cost so dont be worried about that.
Let me know how you get on.
Ross