I've used both
and
I'll second Flip's endorsement of Maxton and add my own for K-tech. Both companies offer their own cartridge kits so drop Chris at K-tech (enquiries@ktechsuspension.com) and Richard at Maxton (maxton@btconnect.com). Tell them what you've got now and what you're looking for and see what they suggest.