Here's the setup I've been trying out this year.
Simple Modern 40oz "Summit" bottle with a
Velo-Orange Mojave cage. A mini-bungee with the hook cut off one end and double-knotted to the cage and looped around the bottle handle serves to secure it on bumps. Everything fits together well and I enjoy the use of the bottle, but there is a bit of occasional rattle to sort out yet.