I didn't see this thread last night, but for those moments when the tonic is finished, may I recommend a White Lady? Gin, Cointreau (or any other triple-sec) and fresh lemon juice in equal parts, shaken over ice, and served in a glass with a sugared rim is the recipe I use, but YMMV.
It's a bit of a faff, but jolly nice, and the guaranteed way to a short night!