Ribery just signed a new contract. It seemed like they were too stacked and Thiago wouldn't get enough game time but I think Pep is going to play with something like this next season:
Neuer
Lahm Martinez Dante Alaba
Kroos Schweiny Thiago
Muller Gotze Ribery
This has everyone in their proper positions pretty much apart from Gotze, and doesn't leave anyone out. Robben was never going to be a starter this season, he wasn't first choice last season but most people here only watched Bayern in the latter champions league games when Kroos was injured so Robben got his chance to start. Robben will stay as a squad player on the bench like he was last season, come in for injured players, and the year after when Lewandowski comes in, one of Ribery or Robben will leave most likely because Robben will be 30 and Ribery 31.