Sorry I was away from the computer / couldn't reply sooner.
Yes, you understood everything correctly on your last message.
It does not matter that Commons from step 2 are connected to commons of step 4.
Remember to swap the white / daisy chained brown wire on the spares. This way you will not be caught off guard later on when you get to use them.