Please keep us posted when you know more about whether 3.0 will be a separate product, it would be unfortunate to buy this then find out the next day that 3.0 is a different product.
I mean if you really want to wait, it'll probably be awhile. You can buy 2.0 right now and get its price discounted when you upgrade, just like he does for the 2.0 standard to deluxe upgrade. Deluxe costs $40 but when you upgrade it only costs $20.