Just flew SFO-HKG in Raffles and didn't see the small Evian bottles. They were using Crystal Geyser to fill the glasses though. In regards to seat assignments, I would try to get Row 17 if you can. It can be quite cumbersome to get out of your seat if you have the window seat and your wife who has the aisle is sleeping.