Without a doubt figure on a Macbook Pro, not an Air.
If I were you, I would consider the 13" retina, or the 15" retina, and I would max out the ram. This will feel much more expensive than your old computer. Its probably worth it for you if you are continuing to use Adobe CS.
All of them...