Yup. Plus, Diane and (I'm going to assume) Renata will be there with Doug and his family. No dramas at the actual funeral.
In fact, I think he credited Flaherty with the original 'come-to-Jesus' moment, so it's entirely possible that his death will re-motivate Ford. I think this will be...