I bet you have to get creative and make some of this cobbled from parts. I have installed PS2 and PS3 from donor engines and have done it both ways. It's a lot of extra work.
If I remember correctly, it was more work converting to the wireless.
I thought you might try the tender frame swap but you state you got that handled.
I remember grinding away some serious metal to get the tether connector mounted on the engine side. It might be easier to have that end permanent.