1.8T fuel pumps.

Hey!
Im gathering parts and bits to do my 1.8t engine swap. 
There is alot useful guides and tips already on the site, cheers for that!

But right now, Im bit confused on fuel pump setups. 
My car is -83 1.6 carb, so no gti tank and i dont have in tank pump either.
 
1. I think easyest way i could go is :  in tank lifter pump -> swirl pot -> filter -> walbro -> engine, right ?

2. So far iv understood i could use in tank pump from G40 polo/mk2 rocco/late mk1 caddy etc. Is  part number 867919051M the correct one ? 

3. Is that original lifter pump enough to feed walbro or is there some drop in upgrade pump i should buy with assembly ?

4. Also what kind of swirl pot i need / witch fits under mk1 ?

Thanks !!

Found this thread which helps quite alot ;
https://vwgolfmk1.org.uk/forum/index.php?page=topicview&id=modifications-and_2%2Fmk1-20v-turbo-2-fuel