All the RCI ships I have been on have had a dive school on board.
Try Seabourn. Some of their ships (Yachts as they call them) have onboard marinas! Happy cruising.
I think Idenpendance of the Seas new ship of RCI has these facilities.