Extended shallow-water theories with thermodynamics and geometry