What time you dining at? Before should just be at O + P itself as wine cocktails and spirits are among the best in the city.
Republique also has magnificent cocktails.
But you want to go drinking until like 2 am after? Melrose Umbrella Co or EP/LP on the rooftop are the best bets for that. Unless you are beer fiends ten the Surly Goat perhaps.