Having had a go in some potential replacements, including an f type r I've decided to keep my Z4M for a while longer, and treat it to having the geometry done.
Does anyone have experience of a good place to have this done in north or west London or Cornwall?