Replying to Macbook vs Macbook pro

Sometime, probably this summer, im gonna convert to mac-ism.  Im looking at the macbook and macbook pro. if i were to get the macbook, i would get the 2.0proccesser one and if i went with the pro i would get the 15inch 2.16 proccessor one. I dont really wanna have to spend more money on the pro, but if the macbook wouldnt cut it id pay extra. Mainly, this is for photography and video editing. I would probably buy RAM and maybe an external hardrive for either one. so my question is which should i go for? would i be set if i went with the macbook?