I love the versatility of the Strat, so I will either stick with it or upgrade the particular model I have. I really like the Player's Choice 50s model Strat.
I am definitely going back to Fender amps. Probably the new White Lightning model Hot Rod Deluxe. I think the 1x12 is easier to haul around than the 2x12 Pro-185 I used to have.
I might dump the GNX and go with assorted analog pedals like I used to use. I think I prefer having more individual control on the fly than having the GNX. I am still undecided on that, though.