Become a MacRumors Supporter for $50/year with no ads, ability to filter front page stories, and private forums.
Since the Air 2 is still performing well, I might suggest using it till the next version iPad pro comes out and upgrading then. Most of the 1st Gen issues should be resolved and you have maxed out the usefulness of the Air 2. If battery life is currently not sufficient the a battery replacement is $100 (US) and could bridge the gap. Also most of the Apps should have been upgraded for the new resolution by then.

I waited 3 Gen. of Apl Watch before finally getting one so I feel your pain.
 
Also in regards for "Pro"
do you really need a processor that is literally rated equal if not superior to i7s on notebooks to do tablet-ey stuff? This and can you live without a ProMotion display? (in which if you lived without it and don't really feel like you miss out then the Air is good enough. Especially that all iPads support pencil now if that's your kinda thing too.
 
Register on MacRumors! This sidebar will go away, and you'll see fewer ads.