Not really sure tbh, like i say, it should just be a straightforward engine swap, i think i'd be tempted to put it all back as it should be and work from there,

Cheers, Karl