In my game we only slightly simplified the underwater combat rules to say that only piercing weapons don't have disadvantage underwater (the official rules are basically saying the same thing) and it made a few combat scenarios in our first level bullywug Adventure a little more interesting...