As said above - unless you really need the discrete graphics (or the higher res screen) the MPB has, I'd go with the new MacBook. The Pro will be a slower machine overall (lower clock speed, lower bus speed) than the MacBook, and you won't have the safety net of AppleCare. Even if you do decide you need the pro, it might be best to wait a while and save up for the difference for a refurb.
The 2.16 Pro has the X1600 in it, correct? That shouldn't be a problem as far as the much publicized graphics card issues then - those are nVidia problems.