So, ECU back and mapped again. It certainly feels a little better, still very aggressive, and I am even more convinced now that the problem lays betwee1000 and 2000 RPM, most noticeably in 2nd gear and even more so when climbing a relatively steep hill at low speed.

I did a Nanocom recording and have put links here: Nanocom Files

I am VERY new to the Nanocom so if anyone could be kind enough to let me know if they see anything glaringly obvious I'd be very grateful!

TIA!

And the fault codes.....
Disconnecting the MAF sensor doesn't seem to make any difference...there's another in the Air box isn't there ?APP....I have read somewhere that this can be a culprit?

(1,7) AIR FLOW CIRCUIT, (LOGGED LOW).
---
(1,8) MANIFOLD PRESSURE CIRCUIT, (LOGGED LOW).
---
(2,8) AMBIENT PRESSURE CIRCUIT, (LOGGED LOW).
---
(3,7) AIR FLOW CIRCUIT, (LOGGED HIGH).
---
(4,1) INLET AIR TEMPERATURE CIRCUIT, (LOGGED HIGH).
---
(4,2) FUEL TEMPERATURE CIRCUIT, (LOGGED HIGH).
---
(4,3) COOLANT TEMPERATURE CIRCUIT, (LOGGED HIGH).
---
(10,1) AIR CONDITIONING FAN DRIVE OPEN LOAD, (LOGGED).
---
(10,3) TACHOMETER DRIVE OPEN LOAD, (CURRENT).
---
(10,4) GEARBOX / ABS DRIVE OPEN LOAD, (LOGGED).
---
(10,5) AIR CONDITIONING CLUTCH DRIVE OPEN LOA D, (LOGGED).
---
(10,6) MIL LAMP DRIVE OPEN LOAD, (LOGGED).
---
(14,1) AIR CONDITIONING FAN DRIVE OPEN LOAD, (CURRENT).
---
(14,3) TACHOMETER DRIVE OPEN LOAD, (CURRENT).
---
(14,4) GEARBOX / ABS DRIVE OPEN LOAD, (CURRENT).
---
(14,5) AIR CONDITIONING CLUTCH DRIVE OPEN LOAD, (CURRENT).
---
(16,2) HIGH SPEED CRANK (LOGGED).
---
(20,4) EGR VALVE STUCK OPEN, (LOGGED).
---
(20,5) EGR VALVE STUCK CLOSED, (LOGGED).
---
(21,4) DRIVER DEMAND 1 OUT OF RANGE (LOGGED).
---
(21,5) DRIVER DEMAND 2 OUT OF RANGE (LOGGED).
---
(21,6) PROBLEMS DETECTED WITH DRIVER DEMAND (LOGGED).
---