'67 Alignment issues after '74 Disk brake swap

[Sheetaki]

So I've got a '67 C20 that I swapped a set of '74 spindles onto. I thought I'd done my research and that all I needed was '74 balljoints and I'd be good to go. Turns out that was pretty close, but I ended up reaming out the tie rod hole and using my old '67 tie rods, and I can't get the dang truck aligned anymore. The shop did their best and I've got .94 Deg caster left and 1.4 deg caster right. Steering the truck is even harder now (no PS) and it doesn't center itself anymore. I like how the brakes feel, but driving the truck SUCKS. A buddy of mine suggested that I may be able to get away with swapping a '73-87 upper control arm on, but otherwise I'd have to swap the whole front clip off the later model truck.

Anyone done this swap and dealt with the alignment issue? This truck's whole thing is function over form (she's ugly), so she needs to drive well!