I had ProKit springs on mine, way better than stock but then I put Jom coilovers on and they are not only more comfortable than you would think but are the best value suspension out there IMO. Had them on a year or so now and love the ride height adjustability, mine is just where I want her now..
With all you've done with the gear linkage refresh, top it off with a z3 shift lever, fits perfect, shortens the throw by about 30%, it's an OEM mod and above all it's cheap! I got my Joms and z3 lever from Cab at Super4 btw..