Hey mate, have you had a scan done to your car?
I have a similar issue with my BA, under acceleration the engine light comes on and the light goes away once I'm off the gas.
I replaced the TPS and it still continued, got a scan done and it comes up with P2139 "Accelerator Pedal Position Sensor 1/3 implausible ratio" and P2140 "Accelerator Pedal Position sensor 2/3 implausible ratio". So it turns out I have to get my pedal position sensors replaced, bit of an arse of a job but what can you do.
Long story short, I suggest you get a scan done wherever you can. I know that SCA offer a full scan report plus clear memory for $28 if you can't find someone that can scan your car. It's definitely worth a try, the answer may be sitting right in there for you.