Thats the one i have just had delivered today, looks like a good enough fit to me but i see what you mean about where it meets the headlight
This is the only one i can find available to order on VWs system and its listed as a T5 unit (not T5.1) so not sure what other one you have, do you have a pic or part number of the alternate unit ?