Todd, if it was mine, I'd go back together with what was in there, at least to start with. The front shock change may be all you need. Stockers can be fussy with the front springs. But not always. There's a balance between ride height, stored energy (to get the car up) and control when the front end comes down.
Starting with what worked pretty well isn't a totally bad approach.
-Al