Not what you are looking for but I've been considering biting the bullet on taking mine straight to the horse's mouth..
Probably also a bit of a rip-off but I don't think I have the patience to tackle mine myself anymore. It's utterly fcuked in loads of ways, and my last attempt at buying tools to tackle the BB/headset myself just led to cuts, bruises and much swearing (having built several 'normal' bikes without these problems!)...
Anyone used that store?