I would definitely also say wait for September. We at least know new CPUs are coming in, but there are also other nice rumors. Especially since you practically want a MBA again, just more updated (I myself am also waiting for the updates in September and have been for a while).