I think this is how it should be done. I personally prefer to have a glass of wine / port with dessert / cheese rather than a cup of coffee. Coffee and chocolates at the very end of the meal. I wouldn't expect to get offered coffee along with my cheese course at a restaurant.
I wouldn't expect to get offered a cup of BA-quality coffee in a restaurant either...