RSVP and a new company called Romance Voyages are doing river cruises for Gay people. Have you looked into that possibility. My partner & I did the RSVP Danube cruise last September and enjoyed it very much. The ships are so much smaller, you get to meet almost everyone.