I think the current situation doesn't necessarily fall into 'waiting for the "good stuff"'. We know what is coming up and with the great pricing on the i5 & i7 first gen CPUs the upcoming 32nm i3/i5/i7 CPUs should be pretty reasonable.
I had been considering upgrading to an i7 laptop and also upgrading my desktop from a Q6600 to an i5 or i7 but after reading about the upcoming Intel i-series releases I've decided to wait it out.
Hopefully desktop motherboards for the X58/1366 will drop some as well.
With the core i9 coming on to those motherboards, i some how doubt they'll drop much.