I still think that the final could be City-Bayern, they have nice squads, good depth and their calendars alongside position in their leagues can give them the edge to arrive well.
And I think City is the better team but would beat on the Munich side to win it. The type of football they perform can give problems to Guardiola, that sometimes for important matches he uses unorthodox tacticts but a risky gamble in the end.