Yes, definitely worth giving the Exact Express and RS a go. And, if the output is then a little too close for comfort, reducing preload.
Re the latching issue, if it were to not continue to resolve, check these four areas:-
The thickness of the spring guide flange.
Spring length.
Cocking arm not bent.
Trigger unit not "gunged" up.
Guessing that you did fit that new piston, so wear at the rear of the cocking slot shouldn't be a possible fifth area to check.