130PDS Extension Tube 2" or M54?

[Ratlet]

When I got my 130PDS I bought a 2" compression fitting to go on the focus tube but I noticed whilst collimating that it is unable to hold the provided Skywatcher Extension tube reliably and it will incredibly easily tilt (The bit it gips onto is very short and has a bevel).  This probably explains why I had a bad first experience of the SVBONY 8-24mm zoom as the eyepiece is heavy and would have induced tilt.

I'm looking to a replacement but I'm unsure if I should just get a 2" 50mm compression extension or if I should get an M54 40mm extension to screw onto the focus tube.  Gut feeling is that the M54 will get everything to be tighter and still provide enough travel to achieve focus.  I'm just a bit cautious with buying bits now so would like some others experience if possible.