Took apart the right side again. Ensured that I wasn't crazy and that the shims were there and that there wasn't anything wrong with the trunion. I then tested the movement of the knuckle when not attached to the steering. It moved very easily as it should. I then buttoned everything back up and the problem seems to be gone.