MK1 GTi - Sourcing S3 FSi engine swap-

Hello Everyone,
I have a small MK1 based business here in the US - MK1Engineering.com

I have restored several MK1's over the years but have focused my time lately on selling parts and reproducing obsolete parts. 

To make a long story shorter, I have a long term customer who is entertaining the idea of having me swap in a S3 BHZ engine into his GTi. 

Since this particular engine isn't available stateside, can anyone recommend someone to purchase a complete engine swap from? (Engine, loom, ecu, pedal, portion of car harness etc) As for shipping, I could have a freight forwarder pick up the engine if everything is crates properly. 

On a little different note, what are you guys doing for a good quality replacement fuel tank??? We have aftermarket tanks here, but fitment isn't good and they do not have an internal baffle, so cornering with anything less than a half tank is no fun.

Any info is greatly appreciated!!! 

A pic of the car for kicks-