[Yotadzl]

I've seen a little about this on here, but no real clear answers on how to solve this. I am working on a 99 24v with a p-pump swap. The components I am aware of (I only did part of the build) are as follows:
-180 pump with 7mm dv, 4k springs, hamilton v2 pump cam and springs
-DDP custom injectors (I don't recall exact flow specs, but around 52-56 lph I believe)
-Industrial Race twins (older with 66 Silver and 87 mm S4T)
-Built trans with Stock stall, maybe 2200 rpm?
-FASS 260 with TorkTek orifice overflow

The problem is it surges a little in neutral, but when dropped in gear it surges really badly. I've built similar pumps for 12 valves that did not have this issue. I've heard it may be injector related, but not exactly which way a person would go to help alleviate the issue. I have tried different idle springs and idle rpm settings to no avail. I also swapped from 191 to 7mm dv, which did not help the surge.

So has anyone been able to solve this issue? And be willing to share what they determined? I know some surging is normal with tight governor springs and built trans, but this is extreme.