MacBook Air :: Stick With Plans To Purchase MBA Rev C

I knew I should wait to see what Rev C looked like before buying an MBA, but I am disappointed that we didn't get 4GB RAM or a larger SSD. So now I'm strongly considering a new 13" MBP with 256GB SSD (or maybe 500GB SATA if it isn't too sluggish) with 4GB RAM. I know it's a steal, but on the other hand the MBA price cut is pretty tempting. Is anyone else on the fence about which to get? The 13" MBP or MBA? I'm going to college in the fall so portability is a consideration, though either option would be an improvement over my 12" iBook in terms of weight and even thinness.

I have two major concerns with the MBA rev C.:

1) The battery. 3 hours (with the MBA) is probably good enough in most cases, as this is roughly what I get currently with my iBook. However, the MBP has a major advantage with its new battery tech.

2) Hard drive. I know I would not buy a MBA unless it had a SSD in it, but I really don't know if 128GB will be enough for me down the road. It is right now (my HDD space is mostly music and iPhoto libraries...no video editing for me) but I am thinking that videos from iTunes which I may or may not begin purchasing at some point will eat up space. I would be more comfortable purchasing 250+GB of HDD space in my next computer. I remember in 2004 buying my iBook thinking that 30GB would be plenty. Boy, was I wrong!...................