I would go with one of the laptops since you will want to use it in college, and portability will be quite handy then.
As to which one to get, well it depends on how much money you want to spend.
If you can afford it, then go with the macbook pro. A computer with higher specs stays current longer, so its not a bad thing to layout a bit more now, vs buying another computer in a couple of years. However, if this will be just for browsing/homework/l and light gaming/photo editing and as your music/video player then a regular macbook will do fine, just get a nicely specced one. However, if you will be doing heavy graphic editing/gaming/photo/video editing, then go with the macbook pro.
Also a point to consider, depending on what your major will be you will probably want to invest in a copy of windows and run it with bootcamp/parallels for any software you might need at school.
