"In very rare cases, the first sips of water might cause nausea. Then, every sip of water should be kept in the mouth, mixing it with saliva and then swallowing in about 20 - 30 seconds."
(just for reference, I don't recommend breaking the fast according to this article)
Personally I've had the problem of discomfort in part of the throat when drinking after a dry fast, but it went away quickly.
Can't really give you advice, just say what I would do if I were you based on what I've read and my limited experience...
First, I'd break the fast a day or two earlier to have at least some time to re-adjust. Well, taking into account my own body I'd leave at least the amount of days I've dry fasted between breaking and work...
As for the water, I would try diluted grape juice, 100ml juice and 400ml water. If that tasted too sweet I would further dilute it.