Y Stop mount for a Creality CR-20

On my new Creality CR-20 I noticed was that when I homed the extruder, the nozzle was not over the bed, but was about 4mm forward of it.
When I looked at the Y stop assembly I found a couple of things that didn’t look right. 1) the mounting bracket appeared to be rocked forward as if trying to compensate for something, and 2) the screws/bolts holding the switch to the mounting bracket turned freely because the thread been stripped from the mounting bracket.
To fix the these issues I printed up