Remove the boat theme. Burn it. Destroy all evidence of it. It never happened.

I like all of the music in this game, some of it just gets stale, such as zone music/etc. Making the songs feel more varied will certainly be an upgrade.