Put the 1.8 16v in the cabby as realistically that's the only improvement over the 3i.
Plus they rust way more than the cabs so IMO stick with what you've got,they weren't bad motors at all but really nothing special.
As much as they get maligned drive a saxo VTS 16v then the fiesta and it would be like night and day,quicker,better handling,less rusty and you'll see why the 2i 16v never really caught on.
Turbo new ball game as they were nippy and have the "history" as well.