I've seen many different racks on this forum so I don't know if it would work in your case or not but there is a video that somebody posted and it shows the keeper inserting a pin in the front of the rack after the tub was slid back into place. If you could do something like this than at least it would get you into the habit of making sure the tubs were pushed in all the way.
If you didn't see the video but want to see what I'm trying to explain, let me know and I'll gladly search for it and post the link.
I hope you find your bp soon!