You can say this. We also have an expression for this situation: "The water went down the wrong pipe!" (If you are drinking water, and you choke on some)

Yes you can. It gives the impression of recovering and tends to be a bit more natural in speech.

Hello Ali, You may say "I choked on water", without using the word "some".