Do you have some precision ground stones that you could go over the mating surfaces with? As long as you are all torn down, it is a great time to make sure there are no irregularities in the critical surfaces.
I know that a lot of people like the swivels, but it has been my experience that they can rage havic on the accuracy of the setups. If it were me, I would leave it off until you need to use it. That gives you the best setup most of the time and the option to set up the swivel when the project requires it.
Every time I scan through the images above, I am amazed at the way your walls looks. I will have to keep this in mind, maybe not for the entire wall but for around machines maybe.