front driveshaft angle with 7" lift

[76stepsidechevy]

Ive got 6" bds front springs with a 1" zero rate up front (76 K10 465/205) I had the front shaft out to troubleshoot a vibration and with winter coming I went to put it back in and no dice. In the time the front shaft was out I added the zero rate blocks and replaced badly sagging motor mounts. Im about 2" short from even being able to bolt up the shaft so obviously it needs to be lengthened but what about the angle?
I've got a cv shaft out back and that angle is set up pretty well but what can I do up front? The front springs came with some small (maybe 2-4 degree) shims but I had to take them out as I couldn't keep the truck in one lane going up the highway. Is my only option here the cut and rotate the knuckles? The angle looks like it might work with a regular single cardan shaft vs. the stock cv.