Yup, stem swap is the way to go. I actually just swapped stems on my LHT today (kept the 17-degree rise but moved from 90mm to 130mm), and it cost all of $5 to do so.
Raising the bars might help a touch by changing the stem angle (moving from a 10-degree rise to a 17-degree rise, for example), or doing the opposite of what I did and moving the bars a bit closer in to you by going for a slightly shorter stem if you're feeling "stretched out." If the problem is more that you're too curved / bent over, then moving the bars in will probably only make the problem worse. Another option might be to see if you could put another spacer on the headset assuming it's threadless?