I think so, yes. I'd like clarification on something, though. I had the Master Collection at CS5, I'm now CS6 Creative Cloud, not planning on lapsing but if I did, can I at least upgrade from CS5 in the future?
One thing I do like is that if I find myself on a Mac other than my 2 Cloud Macs, I can disable them from the new Mac and work as normal. As I recall, you had to go back to the existing Macs and disable them before you could start work on the new Mac, a real pain when you're freelance and mobile.