Nice progress, the O rings are a pain, they either break or are dysfunctional useless..
When I did my yellow van brakes I made my own spacers from 6061 ally and of a wood spade bit to create the step for the O ring. Bolts were like yours, 1 longer than needed but there wasn't any option so I left it. Rotors were BMW E36 I think and needed some lathe work to get to fit and so did the spindle, I highly don't recommend it !
Just thinking after the fact with your battery tray, I would sit it down in the cavity and board up that side, it'll give a bit more space.. if that matters..