Yes, get two pairs of fins. My dry suit fins are larger than the ones I use for diving wet, because when I'm loaded up with the dry suit and dive gear I can't bend enough to pull tight fins on or off. I'd rather have fins a bit too big than too small and with some fins that doesn't matter, but with some they have to be exactly the right size or they're agony. Scubapro Jetfins are a case in point.