Good luck! I am thinking of you and your little guy!
I use a harness now and, after reading your post, will refuse to use a collar when taking my puppy for puppy class in the coming weeks. I will have to quit the class if they do not allow a harness.
All the best for a speedy recovery!