Ended up selling the bontrager rapid to a mate, it was a great pack but wasnt a fan of the bottle location.
Have been using the camelbak LR4 for a bit, but wanted try to a bidon set up.
So chucked on a cage and strapped the tube and some c02s on the frame, and picked up a fox hip pack slim
Another option ive come across, bib liner with back pockets!
https://www.bikebug.com/100-revenant-bib-liner-black/
My aim was not to carry a hip pack at all, so now i can fit my phone / repair kit / car keys in the bib pockets. I simply wear my usual baggy mtb shorts (shell only) and jersey over the bibs, padding on the bib liner is pretty decent too.
You have multiple bikes hey?
Reason I ask is that on-bike storage is so good these days that you can usually get away with not having anything on your person and everything on the bike.
Multiple bikes yes, multiple mtbs sadly not.
Im still running the Niner hardtail.