Option 2 . However the screen real estate of the 24" would be sweet

Have a look at Mac rumours there may be a Macbook pro update v.soon. So you could get a good deal on an old MBP

http://buyersguide.macrumors.com/

Lets hear how you get on