Just fitted Bilstein B4 all round to mine, old ones weren't leaking and felt fine when I removed them but along with new lemforder top mounts (and new springs) the front end feels so much better.
Bought from autotiele I think, so much cheaper than UK suppliers esp the one who fronts as "bilstein suspension store uk" best avoided.
Nice garage BTW