Just looking at the Workshop manual and as you describe seems correct.

The power flex washers go )( as well.

The rubber bushes can be tapped out with a screw driver from the edge, as there is a metal edge band on them