If you do a full 3L you throw the IMRC in the trash. Get a 2.5L to 3L chip from ADC and have them turn off the IMRC functions all together and adjust the fuel and timing accordingly.
As for the fuel rail mods, I can do them - PM me for the price and details.
The ATX bushing you can cut-off with a die-grinder and cut-off wheel.