One thing I’d wish Flickr would do with the new paid plans is that if you have Creative Commons photos and content, that would not count towards the free 1000 photos limit.
But that would probably be sort of difficult to implement.
They are doing the right thing tho.