On second thought, as I'm in a somewhat similar boat, none of the above. Suffer with a entry level hybrid and save the extra coin for either rainy days or moving day.

Since you're working full time, going to school full time, and doing side jobs for the school and the LBS, you aren't going to have too much extra time to spend in the saddle to warrant a truly nice rig.