I think it's for sure that Ben and Grace will eventually work things out, and tbh it's the way that comes with less dumb drama so it's the best option, even more so because it's the one that results in Danny gone - even if he does continue to see Olive, that can be off screen (although I feel once Olive properly reconnects with Ben she may lose interest in Danny).
The show is definitely better when the focus is on the family and the mystery