I — like most here, I think — would be rooting for Waterman to limit his role as much as possible.
I think Caleb could find a valuable niche as a 4, though. But I doubt he'd come here if a main role couldn't be guaranteed him. If he'd even considering returning here at all.