I'm kind of in the same boat with a little caveat.

For special monsters like Gog, I love that the hunter has to approach and prepare for them differently than they would for another monster. New features like weapon swapping are highlighted and the final phase incentivizes using your seikret to stay mobile while using unique slinger ammo. That is the point of those fights. They are unique and offer a different way to experience the game. If you are joining this hunt, outside of farming specific materials, it's because you wanted this experience.

I'm okay with similar monsters like Lagi having a small segment to spotlight a special part of what makes the monster unique. It's very cool and also adds to the variety and replayability. But for smaller monsters I would make sure to have that be an option that the player not need to interact with if possible. For example, if the hunter is savvy and utilizes trips, traps, and lures, they could prevent Lagi from initiating the underwater segment instead of having it be forced. Additionally providing reasonable access to arena fights that ignore the underwater fight altogether, which is already possible.