Should I get: Macbook Air 2012 OR Macbook Pro 2011 (Old, Non Retina)?

[Kevin]

I am an everyday user and I am looking for a new laptop. I want to surf the web (youtube, facebook, twitter, tumblr), Watch videos, Listen to music (about 500 songs) and watch movies on netflix and such. I also want to do homework (microsoft word/powerpoint.) I want to know which computer is more worth it and better.
By better I mean faster processor, load up and shut down and such, and will respond quicker if I open an application etc. Which one is a more "bang for my buck?"
They're both 1,200 dollars so I'm torn apart. I don't really care that there is no DVD drive on the air. I don't care that much about the portability because the computer will usually be on my bed or desk (I am able to carry it.)
The only problem is the storage space. The air that I want to get is 128GB storage space. Will that be a problem? I have 60 GB right now on my PC, and I want to keep this computer for a long time (maybe until college which is in like 4 years..) So which one is more worth it?

[?]

For everyday use, I recommend a MacBook Pro because of a bigger storage capacity, also a MacBook Pro and a faster processor such as a Intel Core i5 and i7 which are fast and could handle many processes. A MacBook Air should be used for light use or if your on-the-go. Now the price of both are fairly close to each other.