CV Drive Shafts

Yes, easiest solution would be to have the output shafts replaced with the Porsche 930 flange. There's a wide range of strong CV's available that use the 930 bolt pattern and this makes things easier, both for custom CV's and off-the-shelf.

As has already been said, adapters aren't ideal as they shorten the CV which in turn increases the angles throughout the range of motion.