Changebout Upper Control Arms?

I like Firm Feel and SPC Gen I or II. With your set up I would, at the very least, use Moog offset bushings. There is more to be had beyond what the bushings can give you though.
Use the search function to look up reviews on specific UCA’s you’re interested in and follow the builds that are using them in spirited driving. I’ve never seen someone say it wasn’t worth using geometry corrected arms.