Take a look at the
Ibex Xray Race.
I love mine and use it for everything you plan to (although I wouldn't call my commute
short). Meets your specs too. Also comes in well under your budget, so you can have $400 extra bucks to blow on other bike gear.
Only drawback is it looks like they're sold out until Feb of 07