Funny enough, in all the games I run (no matter the system or setting) I have decided that merfolk are a combination of humanoid and dolphin, not fish (considering the tail orientation and movement). Then there also exists larger versions of giant+whale.