I wasn't suggesting going to a toggle. That's just my preference and what my Dean came with.
Going with a 3-way and push-pull you'll be getting more options, but not all of them will be hum-cancelling.
If you want more flexibility, you could try my layout, which is a 3-way switch with push-pull pots on both volume and tone, which individually switch the neck and bridge pickups from series to parallel mode. That gives me 8 tonal options, all of which are hum cancelling, all of which sound *amazing*. At least they do with the '59 and JB, which sound fantastic in parallel mode. Dunno what the AN/TZ sound like in parallel.
Humbuckers in parallel mode sound a bit more open and breathy, with a hint of glassiness on top. It's not a totally bright single-coil sound, but it's close. I find the parallel-wired '59 sounds quite Stratty, and the parallel-wired JB has a bit more Tele-like spank to it.