The previous model was designed around creating and positioning tori. I didn't have a great deal of success in using the printed result, mainly as there was too big a lip. Rather then fiddle with the existing model, I went back to the drawing board and simplified.

This time I'm just using three cylinders and creating a lip through rotational extrusion of a triangle. You've got a number of controol to tweak the model to your desires. Have a play. I hope you find it useful.