What's this waiting business you speak of? Last time I heard BD will be released but not launched since no launch date is given. For all you know it may never launch.
I say screw AMD and go to the i5 2500k/i7 2600k, get 5ghz clock and stick around for a couple of years while you enjoy crazy levels of performance. Waiting is just dumb.
OP: Just go with what suites. If you want hardcore performance "now" then go Intel all the way.
But if your machine is keeping up with what "you" want to do just wait it out until Bulldozer comes out and do a comparison between the two, then make a decision.