To wait, or not to wait....
Waiting is up to you. It's like saying, "I know that better MacBook is coming out in the next few months, do I wait or not?"
General consensus is that if it makes sense to buy, then buy now. Be aware that Apple is currently consuming 25% of the NAND flash...