Macbook + 23" Apple or 24" Dell screen
laptops are for portability. Macbook wins
plugged into a screen at home, Macbook wins over MBP screen
MBP doesn't offer anything that you need for what you're doing
17" is a joke. Spend some time on a 23" & you'll know what I mean. unless you already have a spare lying around... just spend the extra bucks for a 23" or 24". The Dell 24" is very well priced and excellent in terms of bang for your buck.
You will not be disappointed with a larger screen at home. A screen can last more than 1 computer. 2.4" increase in diagonal size is nothing. Go big if you're going to get a screen. Make deskspace for it. It'll be worth it.