I think you should get what you want, when you want it. Yes, waiting for the 05 to roll out would be your best bet, but what if they don't have what you're looking for (colors, features, 2.0 vs 2.3 etc etc...) in an 04. More than likely the dealer won't be able to get you what you want in an 04...