Sounds like a great flight. A good crew do indeed make all the difference between and okay and a great flight.
The refilling of the water bottles is a pet peeve of mine. I know it makes no difference and you are drinking the exact same things, but it just feels a bit cheap to watch them do that in business class.