Though I agree to an extend about the Bayern vs Barca part but u cant really speak of Ribery as he is giving an wonderful performance anymore, the guy was one of the best wingers out there and probably the best winger along with Ronaldo on the left during his golden days but not anymore, after the treble Ribery was only a shadow of himself worse, he barely played, as much as I like that player after 2013 he literally had so much injuries and downsides that he was more on the teams hospital than in the pitch, sadly anyone could have seen his poor performance against RM on the 2014 UCL final, yet that was the final decent performance he had, so I dont really think Ribery would have made any impact to the game, the only one that Bayern was missing was Robben and Alaba but its not like they suffered on left backs since bernat has been world class throughout the whole season and is listed in the top team of the best transfers and Alaba has played most of the season as a MF, where he even got his position as a MF on the Bundesliga formation, I'm not really talking as a fan of Barcelona but I'm talking what I really think is true, for me Bayern in 2013 was just too good but the age has caught up to them, they are not the same and for me I still think Barcelona would have edged out the win with or without the players u listed.
Completely agree with ur choices for the UCL favorites.