There's no reason for the timed hot to come back into the room. Timed hot needs to go straight to the rotary switch inputs, jumpered to inputs 11 and 21 (8 position) or 10 and 20 (10 position).
You don't connect anything "all together," each individual line from the switch needs to connect separately to each wire out to the solenoids. You're just going to remove the bank of green relays and connect the wire from the bay to the wire to the solenoids. The spot free is going to need something to isolate the bays, the rest do not.
A1 and A2 on the contactor are the power in for the contactor coil, but you need to run it through the thermal overload. It's most likely already wired where the power from the bay will go in at A1 and the common to the normally closed side of the thermal overload (marked as 96) with a jumper wire going from 95 to A2 on the contactor.
Here's my pictures again where you can see I removed the banks of relays and used terminal strips to make the connections: