The general answer is that if you can wait 2 months, then wait. Buying Haswell will mean you can upgrade Broadwell; both will use the same socket.
However, if using your current PC is very frustrating, then simply upgrade to now to an Ivy Bridge CPU. The small increase in performance would not be worth 2 more months of frustration.