Sadly, the only thing that seems to work is if you restart the game and push these switches on your first visit. It's kinda annoying, but it ain't too bad.
Personally, I just wished we kept our companions when we reach the main ending. They gave some life to the world, they were like, our roomies, y'know?