Ok, just did my first chapter with CC 2015. It's definitely better than CS 5. Even putting the multiple strokes option aside the content aware fill is just better. Now I just need to use it and cover the bad parts with words instead of adding finishing touches until it looks presentable.
It will take a little to get used to but that's the standard. I'm sure the workflow is going to be faster from here on out.