Quality of life improvement for Banjo Tooie

I recently finished playing Banjo Tooie for the first time on Switch. I really enjoyed the increased complexity and interconnected worlds compared to the first game.

One aspect I frequently found myself getting frustrated with was how clunky it felt switching back and forth with Mumbo and Wumba's transformations. The fact that it is required to physically visit their skull/ tent to transform back and forth ended up deincentivizing me from exploring or experimenting in those forms, because inevitably I would run across a puzzle intended for B+K and have to backtrack and transform back before making progress. Maybe the world I felt this the worst was Terrydactyland. I thought it was clever how Mumbo interacted with Wumba's tent to allow for 2 different transformations, but it ended up feeling like such a chore in practice needing to go first to Mumbo's, then to Wumba's, then back to Mumbo's, and finally back to Wumba's to transform.

I kept thinking this would all flow better if switching to Mumbo or a transformation wasn't tied to a location, and the switch could be made anywhere after initially returning the glowbos. Even if you had to visit the skull/ tent to switch, but then could switch back to B+K anywhere, it would remove so much backtracking that mostly just feels like busy work.

I'm curious if anyone else felt this frustration or has thoughts on how this could be improved?