HELP disc brake swapping

My son and I swapped to disc brakes on his 69 Dart the donor car was a 73 Dart with disc brakes. After we installed all the new items with new bushings ball joints and tie rod ends we took his car down to the shop to have the front end aligned. Our front end guy says I have a problem now the driver side is 4 degrees foward and the passenger side is 4 degrees rear and there is not enough adjustment to bring them in. He thinks I might have switch the spindles and calipers.
Now we did not remove the caliper holders from the spindles and the calipers are pointing to the front of the car. He suggested removing the spindles and calipers switching sides and that should put us close to a starting point for alignment. The upper control arms are in right, they match up with the bumpers.
Is he right, I thought the calipers where suppose to be closer to the front bumper not the back bumper??? HELP please