Carbon canister or pump Purge Valve - difficult to know what one to try first, I tried canister first, but it came back again a month later so replaced the pump Purge Valve.
For what they are the prices of genuine parts are high, I went after market for both:
Ebay canisters seem to be OK - mine from Hong Kong had its part number ground off, I suspect its genuine VW part but made chinese market.
The OEM pump Purge Valve said Bosch so I just got a genuine Bosch pump Purge Valve.