Im looking into replacing my engine and management. I want to run edc 16.

First question would be is there an edc16 controlled engine the would have physically the same long block as my ASZ/BPX ?
This way i could just swap the management and ancillaries over.

If not, im looking for maybe a power upgrade at the same time, so long as its a straight physical fit, ie im prepared to change engine mounts, modify pipework and wiring, but not prepared to fabricate new mounts etc.

The project is focusing on running edc16, without buying an 8p. for now.

Any thoughts welcome, but please no suggesting buying an 8p A3 or an A4 :D