Hi Gary,
If the power is very healthy, shortening the spring a tad could well be an option.
If going aftermarket, I'd be trying a WonkyDonky spring and guide kit. Very nice in these. I haven't seen Dave on in a while, so not sure if he's contactable? Hope he's okay.
If you can't get hold of him, my next port of call would be Tony at SFS. He specifies his springs to fit the (very good) standatd guide, so just a top hat required then.
Whilst it's in bits, I'd be applying a little high moly content paste to the cocking lever, the cocking shoe "horn" and also to rear of piston skirt.
Some people also remove the spring below the cocking lever "slipper", reducing any pressure there.