So, quick update.

I've just ordered some standard height Bilstein front and rear springs, and a full set of matching B4 shocks. Will go mad and order a couple of new wishbones from my local dealer sometime soon and then take it apart sometime next week. May well order some new links etc as well. That will give me the ride height I want, and hopefully at the same time let me fix the alignment issue.

Pics when the arrive