As a gen writer I was worried about adding ship matching, but it worked for me! In previous years I often wrote for people who wanted shippy fic: not a good match for them or me, but it was hard to avoid these mismatches. This year I could offer characters and & relationships and match to people who were interested in the same things as me.

My vote would therefore be to keep this combination of relationship and character matching. Then everybody has options to request what they want.