Oh, and another thought with regard to your insurance!
Have you tried Privilege (
http://www.privilege.com/)? They are the same company as Direct Line, but if you have four or more years no claims, they are a fair bit cheaper!
They were fine about "modifications" too. I had a number of items factory fitted, and they just added these to the policy with no obvious extra charge. It did take a while for them to find and list everything, but they were great. Might be worth a look?