I'd agree 100% on the RAM maxing, that's the main reason I hadn't upgraded my laptop yet. Waiting for a month or two, but I plan on a new MBP soon.
A side suggestion: Might be a good time to look into the Affinity Creative Suite (Designer/Photo/Publisher) as a replacement for Adobe. Did that...