I have an idea to connect wave music with boss music, something like on a video below. Transition could be with every music, not only CIU ambient and intense theme.
But about in-game music I don’t like 1 thing. If you set certain music in mission configuration, it will always be that one. IA can add more music slots (maybe purchased in store) and music will be randomly picked from one set songs.
Something like this: