Well done...
Just one minor comment wrt) laser collimators.
Their collimation is not all that critical, what is critical however, is that when the laser is pointed at the optical centre of the primary, the return beam lands at the centre of the field stop by the time it reaches the focal plane. A subtle distinction but one worth making. <-- The caveat here is that you may end up with some tilt to the plane of best focus, which may (or may not) be an issue with large format CCD's.
That is not to say that laser collimators should be left in a condition where the exit beam is anything other than orthogonal wrt) its locating flange.
best
~c