hr certainly will, Messi and Barca in particular are a much improved since then, interesting that Madrid have elected to go with a right footed fullback given that Messi is an inside out winger and likes to cut inside at every oppurtunity, the problem he will have is that Alves will be bombing past on the overlap playing in the manner of an orthadox winger while Messi may just elect wander into the middle or wide to the right which makes him next tom impossible to mark as you would have to free a defender of any positional responsibilites to stay with him
The key to this game is Xavi, MAdrid are going with an attacking midfield which means Xavi will have the room to pull the strings, if hes in the mood he will shred the Madrid backline with his passing game
I expect Madrid to benefit from a highly dubious penalty decision at some point and Messi to be crowded out by and large but that will free up space for other players