I've stayed 3x in the last 2 years at the Waterford - most recently a few months ago; haven't stayed at any other OKC Marriott properties.
I'm a fan of the Waterford and agree that it's one notch above a typical FS Marriott - not a JW by any means, just nicer than your average, business class FS hotel. Great gym, nice pool, good lounge, easy, free parking.