Time for a new cage?

Apologies if this is a bit of a long post but and advice would be greatly appreciated.

A little background info first...

So I started off like everyone else did with a cb6000. After a few weeks of cramming myself into it I decided that the tube just simply wasn't going to fit me well at all and I needed something wider. So I went and found a cage that was wide enough for me to fit into. (A cheap metal one) but the length of it made it unwearable as it stuck out really obviously. About a year went by without anything chastity related and then the burning desire came back to me and I decided I'd go with a custom made device from steelworxx (looker 02) thinking that it would tick all the boxes and I'd be able to comfortably be locked up. (Wrong again)
I suffer with forskin pinching out of the hole at the end, pinching underneath and/or top of the cage when my cock is "shrivelled" and can fot through the bars and urine is unable to get out of the cage fast enough when going to the toilet so after a day or 2 (if I can push through the pinching) it starts to smell funky.


So now I'm back to square 1 as to what to do. I've got the measurement perfect with this steelworxx device but due to the pinching I just can't get on with it, so I'm debating yet another custom cage.

To eliminate the pinching I'm looking at another cage they do that is just a steel tube with no gaps apart from a drainage hole at the end (also a bigger hole than my current cage) . Obvious this will make cleaning harder so I may have to unlock more frequently for cleaning, but at least it will stop the constant pinching (except from possibly at the end)

Or the other option I looked at was the leopard cage from custom chastity at is is an almost solid tube but with plenty of tiny little vent holes in it and urination hole.

And if you made it this far, thank you for your time any other suggestions are greatly welcomed

Leopard;
https://www.customchastity.com/product/leopard-300-set/

Steel heart
https://www.steelworxx.de/Steelheart_1

Thunder
https://www.steelworxx.de/Thunder_1