I'll get right on changing the dialogue a bit!
Yep, the Raft theme changing in the Astral Plains is intentional, since otherwise you wouldn't get to hear its theme very much due to all the water.