I don't know if you are still looking or what your budget is. Like @enuff_zed said above, I live near Inverness but bought mine in Kent five years ago. Good advice from @enuff_zed. However, I've put my 3.0 on Gumtree a couple of days ago. Hoping to place an advert on the forum later. It is...
I ordered a tool and side covers from the same site on the same morning as you SqerrNipz. No contact or acknowledgement from them. Paid via Paypal. Receipt from Paypal. I will update with any progress, he says hopefully.
Now we wait.....
As has been said by others, the ZHP makes a big difference. As a new owner I was nervous to change to it especially as it is not cheap. Well worth it though.
I recently bought my Z4. Changing the gear knob was one of the first jobs. I opted for the ZHP. Easy job and would choose the ZHP again. It is a six speed not five speed.
As said above, a known problem. It is definitely not easy in my experience. Taking the wiper arms off is easy with the tool for the job. I could not remove without. Removing the plastic screws is a nightmare. Still working through this job.