It's close, but I'd pick Waterman. Advanced stats favor him over JR both offensively and defensively. Seems to be an awesome locker room guy. He's not the occasional volume scorer as JR is, maybe not as much range on deep threes, but brings better defense and way more rebounding. We struggled more on D last season than O. His size is valuable to our small team next year. Of course, we are limited to answering this in the context of current roster construction, not knowing who else is joining us, and your answer could completely change next week.