You certainly wouldn't go wrong buying the 32Gb Wi-fi Air (my brother has the same; I have the 16Gb). It's a great iPad in every way...fast, beautiful display, great battery life. If, when the new one comes out, you decided to ditch the Air, you could always trade up (possibly, the current Air will become the bottom-of-the-line regular-sized iPad when the Air 2 comes out...who knows?)
That said, if your iPad 2 is still doing it for you, it wouldn't be a terrible idea to keep it until the new Air comes out. My sister has the 2 and it gets a lot of use by her rambunctious kids, and it's still delivering the goods.
In short, I can't give you a definitive answer
but lots of luck with your choice.
Sent from my iPhone using iPF