I don't think we will see Messi reach the same level as he did in that Champs League final in 2011, but I think people are being a bit harsh on him. There were several times in that game - as there are in almost every game in which he plays - that Messi was surrounded by 4 or 5 German players and managed to take them all out the game, either by skipping by them or passing it.
It will be interesting to see him with Suarez and Neymar next season, as teams deploying the "everyone mark Messi" tactic, should get picked off with relative ease. Obviously I'm speculating, but it will certainly be interesting to see.