Shakey Idle and Underpowered before 2k RPM

[A4-B7Brad]

Hi guys, I'm hoping for a bit wisdom from the gurus on here. 

I have a 2006 Audi A4 B7 2.0tdi PD140 BRE Engine. 

I have been chasing and trying to fix an issue with shaky Idle.

I seam to have a Cylinder 2 Misfire detected on VCDS, upon looking at them further it looks as though 1 and 2 are over fueling on low rpm. Causes the car to smoke a fair bit on idle and briefly when I accelerate. Goes away when the revs increase.

I have replaced 4 injectors with 4 known working ones, changed the injector loom. Fixed it for 30seconds was nice and smooth on idle And then problem still persists. I have bought a new timing belt so will check the timing and replace the belt, 

The car is Remapped (to what degree I'm unaware) but EGR and DPF are Deleted. 

Is there anything I'm missing to look into, I'm starting to run out of patience and the issue gets rather annoying when I'm sat in traffic with the car shaking. 

Thanks in advance. 

[A4-B7Brad]

To add, I've replaced Map and N75 sensors, just done Tandem Pump seals as found back fuel in the old filter. Running out things to try. Going to do a Vacuum Leak test next