I have found a really good ex bmw mechanic who if you want the number I can PM you?
I am really fussy about who I take my car to and now I have found a very good mechanic who wont screw me over etc.
He is really good, maybe you can take it down to him and let him a once over? let him know all the things you have done
He is based in Stourbridge so not too far from you?