I'm kind of in the same boat. I'm currently using an Advantage and looking to get an Ergodox. I really enjoy the Advantage, but the split design, more modifiers, real function keys, etc with the Ergodox is very appealing.
I have no idea when the Axios is coming out, so in the meantime the Ergodox looks like the best alternative.