I've use AW Autotech (Kevin Arthur) in Aberdeen and J D Engineering in Insch, both fantastic. You get discount at AW Autotech as a member of the BMW GB Onwers club.
On another thought, the car has FBMWSH, might be better for resell if I keep it like that, it will probably cost me 200 quid more now but it will be worth it at later.