Well, it could have been a lot worse. Chlorine gas reacts with water and produces hydrochloric acid, which burns skin and lung tissues and can also lead to pulmonary edema.
My understanding is that, unlike phosgene, chlorine does not cause pulmonary edema for the very reasons you mentioned; turning into hydrochloride acid and burning the mucus membranes. Consequently it doesn't pass the bronchial passages into the lungs like phosgene and doesn't cause latent pulmonary edema.
But chlorine would be one torturous way to die that's for sure.