Dave - don't sell up! (funny coming from me) you'll regret it!
I've used falkland for the geometry, they have their own settings, kinda between fast road and prodrive. I had this done on my classic, theyre pretty friendly and happy to help you out. Theyre in glenrothes, just beside the BP garage.
Hope you get this sorted out