When good is not enough, Camshaft time again.
It seems unlikely that your springs will work on a solid roller.
Also seems like there is more to be gained with a cam. But cam swaps are usually a compromise, particularly on a street car.
Do you want similar idle and street manners that you have now? Or you okay with more radical?