from my experience.
I do the same thing as you but might deal with Uploading and Downloading files and a little bit more photo editing, I went from the Macbook 2.4GHZ unibody to the unibody 15.4" MBP 2.4GHZ, I love it, The extra 2 inches is the main reason why I did it and the better screen. Depedends on the money you want to spend. I am a dependent of a military grandfather so I have access to purchase products on base. The price was 1,998.00 no tax and i have a star card. 60 bucks a month no interest, Had to go for it. The pricing was perfect for me and the computer matches exactly what I use it for and always will be using it for. I am going to be soon doing online courses etc etc for dentistry for my RDA then Dental hygienist classes and thats still no stimulation for this machine. Your More then good, with whatever mac you choose 😉