One thing we did that helped was to put a heating in her crib. This way it was warm like sleeping on us. My daughter still cries Everytime she wakes up. I think it's more she didn't want to and is highly upset to be awake. We found that music helped calm her down faster.
We’re going through the same thing right now. I find his cries when he wakes is because he’s grumpy and tired that he woke up and wants to keep sleeping. We try to resettle him (he likes being rocked in our arms) but if he doesn’t after 30min we just move him along in his routine eg feed/nappy change/play, then just put him to bed earlier at night. Does he use a dummy? Sorry I haven’t got the answers :/ hopefully it’ll pass soon and someone else who has gotten out the other side of this can share!
We went through something similar at 4 months but it lasted a couple of weeks or so. I would go to the doctor to rule out pain though.