ITA. Thats exactlly how I see it too. The ending with him staring at the funeral program, to me seemed a more fitting end than him on the phone with Lindsay and her ending their call.
IMO, whatever way the scenes had of played out, Danny still ended it with Rikki before he knew she was leaving...