I would upgrade while you have it apart. There are a couple of factors at work. The wave spring allows fore and aft movement, which effectively increases piston travel irrespective of clutch retainer clearance. Not all piston retainer to clutch retainer fit, is the same. The looser the fit, the worse the problem of excessive piston travel and consequential over centering of the spring. If you have a good selection of oem, and aftermarket snap rings, you will find that a combination of 2, will replace the wave spring nicely.