The MBA isn't underpowered. It's only real weakness is the small HD. Otherwise, a MBA is as good as a MB in every way. A few hundred extra Mhz. is NOT going to matter in the long run. RAM and graphics cards will.
But yeah, if you can, definitely wait until June. They're gonna release lots of new stuff, and you can make your decision then.