Does Oladipo not make Waiters redundant now? I could see him filling that role nicely, but given he's also more of a PnR player, maybe he would be better suited to be the back-up PG and primary ballhandler when RW rests (if RW ever rests, which in that case, would make it useful to keep Waiters if possible).
Also, I'd take a flier on Waiters. Obviously increases the log jam and will undeniably be dysregulated, inconsistent, and a locker-room negative -- just the player I love to root for. Our Nat Rob / Delonte / Ricky Davis replacement.