Sounds like a solid plan.
IMO, nothing has a bigger impact on driving enjoyment than a happy front suspension. There are a few high quality upgrades you can make in that area that don't have to cost a ton of money, and have a super-high smiles per gallon quotient.
What wheels are you leaning toward?
Thinking maybe 15" Torque Thrust 2 with gloss black spokes.