Just to clarify, Riviera and Marina are identical (with steam room and sauna). The smaller ships (Sirena, Nautica, Regatta and Insignia) just have a steam room (larger as you say).
Good to hear the facilities are well used on Riviera. Will be on Marina in September and looking forward to it.