Thanks for all the input guys, I am now thinking I need to rebuild some original upper control arms, of which I do have a really good rust free set. Will have to use Moog ball joints though not the same as the original two piece type, but seems like most are using. Getting the riveting done locally also is not an issue, its getting that diamond pattern on the rivet end that's the issue.