It sounds like you should wait. I am in almost the exact same boat as you. I can deal with what I have now but a Mac Pro would make my setup a lot easier. I also would be upset if I bought today and the models dropped in price and/or came stock with a better vid card, more ram, or whatever other new features. I barely have enough money and want to get the most out of it so I am waiting. I can't imagine June passes without some price changes and/or upgrades.
This is what I did. I traded in my G5 for a second generation MacBookPro 15" and a 30 inch Apple monitor because I thought like everyone else that Apple would come out with a full line of 8 core machines. When they didn't I traded in for a 2.66 MacPro, I will now wait to see what happens next. Fortunately I have the good fortune that I can buy when I want!