Could a faulty map be causing the lumpy idle that I am getting
It won't be.
Get someone with a Vw diagnostic tool on your car. Will help you a great deal rather then clutching now at straws.
I had someone with a snap on diagnostics plug it in and says everything is running as it should only thing he wasn't sure on was if MAF was reading ok or too low it was 0.2 and once revved up was about 22 I believe
Use a Vagcom version. Snap on ones I'm guessing don't have as much search tools ...?
Find someone on the VCDS register on here in the VCDS section, if you won't take it to a VW dealer.
I'm sure you will get help