You should be able to fit both sets of gear in just 1 suitcase IF you pack it RIGHT.
I dive but GF doesn't but she does snorkel so on trips we have 2 sets of: masks, fins, snorkels, + my boots, 2 pairs of gloves (one w/webbing one regular), hood, log book, save a dive kit (a small tackle box...