Nicely done there,
Kinda like your system,

But i would perhaps try a Endstop without the roller, Just a button, It tends to give a better result, Thats atleast what i've heard by some.