My addict son threatened suicide many times when he was backed in a corner. I gave him warning that the "next time" he threatened I would call the police. And I did. He spent 4 days in the psych hospital, unsuccessfully tried to score a scrip for Klonopin, was discharged and has never threatened suicide again in the last year (a record).
I think you handled all that just perfectly. Just calmly call 911 if he ever does it again.
Oh, and HAPPY BIRTHDAY!!!