Lots of great suggestions.
My one thought would be to budget $100 toward adding the
TC Electronic BodyRez to your chain (link is to a review by AGF member Doug Young). In my opinion, the combination of midrange filtering and compression that this wonderful little box provides really enhances the plugged-in tone of pretty much all factory on-board electronics. Of course, YMMV.