Hey Mate,
Yep, I know what the issue (was) is. I was trying to find a soft solution. I ended up using your advice and just fixed the Z stopper...
I'm using a custom made i3, so I'm constantly tweaking and adding new parts.
I will add a Z screw like the makerfarm have and I will be adding an auto bed leveller!