Short stem is the way to go. Upper-back/neck soreness = reaching out. You should be able to bend at the hips and have your hands fall, relaxed, on the bars.

If you can't go shorter on the stem, see if you can borrow or test ride a smaller frame and see how you feel with that.