Yes it is a direct swap.
Try 1K0955453S fot the 5.5L reservoir.
If you don't have headlamp washers, you may need to buy a plastic plug and rubber washer.
When I bought the larger bottle when retrofitting headlamp washers, the headlamp washer pump hole was pre-drilled. You'll possibly need to plug it then.
431955465A - seal, can't remember PN for the plug - it is 22 & 26 on the diagram when you order.