What I'm trying to say is I don't think the ones in my post have the separate module
Yes you are right in a Golf Mk7 (or new Polo) you would have a separate module, but this potentially looks to be everything all in one enclosure...
We should have someone with one of these new mk7 stye units (or Alhambra, Scirocco, etc), who's willing to help us a little bit disassembling their own units to see how are they build (if they can fit, which seems to be really possible), and which type of connectors they use.
Do we know the names of this units? We know that there are at least two or more types (the one you show us "RNS/RCD shape", and the "Golf mk7 shape"; and one module all together, or two modules).
But even if they're separete modules, I don't think that's going to be a problem.
Now I'm thinking, that may be there are more things to care about as well, like Gateway.