Sorry - iced coffee in the water bottle for me. Don't like trying to drink hot things while I'm riding. But looks like that bicyclecoffeesystems.com website ought to get you set up just right.
They've got a real good bottle advertised called the Alfi Iso Bottle, but their link doesn't work.
You can find it on Amazon though.