I didn't catch that or at least didn't see any teamsheet posted. I noticed you said something about Bonhof and Beckenbauer but it didn't come across as any sort of significant change.
No, it isn't a given, certainly not in the way I laid it out, and you did indeed focus too much on stopping the attack so it looked even less obvious.
That looks a bit funny, particularly re: Beckenbauer. You didn't need to switch away from your tactics much either:
Bonhof on the right so he can sit and cover on the right flank if needs be while Beckenbauer is up the pitch. That would allow Matthäus to focus on beasting the midfield and not reducing him to a cover provider, although he may have to provide it for Brehme if Lothar's mark (Zizinho) drifts wide.