P5 - BTA aero bottle cage & Garmin mount ideas/options

I currently use a Speedfil Z4 BTA bottle cage with the Garmin mount on my P5. The cage is getting old and is not as tight as it was and no longer grips the bottle well enough. I have lost my bottle in a couple of races now!

Any other suggestions for a good set up with a good cage and Garmin mount? I don’t have a lot of room and need to attach my Garmin too

Thanks

Profile design has recently released a new bottle with Garmin mount: https://profile-design.com/collections/hydration/products/hsf-aero-hc-800
.