I tried one of those pillows, but even the lower side is too high. So now I use a feather pillow, old enough to be kneaded in the shape I want, sometimes with an added plush piglet under my neck. (Which was an accidental find, it just happened to be in that exact spot without me noticing one night, instant relief!
)
I'm not sure about the topical ibuprofen, but for those two weeks I'd rather go completely without to be sure. I don't think any studies have been done on that, the study I found is from this year.
Massage sounds wonderful, regardless of it helping or not, but it's also expensive if you can't find friends who want to give it a go.