Drive shaft problems 6 speed sticks

Hey guys, as some of you might know, I'm moving along nicely with my Mk1 Jetta PD 130 6 speed resto/modernisation project 

One of the major problems I'm going to have is the drive shafts, the hubs on the car are mk4 130 hubs and the 6 speed O2M gearbox.

Would any one on this planet have any ideas what to do with getting shafts to fit? I do have the 130 shafts but I took them to an engineering company to get shortened hoping they wouldn't mess it up, the shortened them and melted the cv boots like they said they wouldn't and when I trail fitted them, I found the shafts warped and not even straight (cu ts )! There is a few guys Ive seen have got the same setup I have but they won't give any info, can someone please shed some light 😀

You need the gearbox output flanges from a 20v non turbo GTI 100mm and use your 100mm Mk1 GTI drive shafts as normal