The bike fit guy is a Cat 5 racer which could have been fairly intimidating for a recreational rider like me, but he didn't balk at all when I told him that my desire wasn't to be in a more aerodynamic or aggressive position, but instead to relieve my shoulder pain. We determined that the goal was to get me comfortable enough that I can tolerate my bike for the length/duration of rides that I want.
He first helped get my saddle/seat post in position for proper leg position, then he swapped out my 7% stem for one at 30% to raise my handlebars fairly significantly. The idea is that this will put me in more of an upright position and take some pressure off my arms/shoulders.
I'm not sure how easy it is to see the change from the photos because they aren't from exactly the same angle. I guess you'll just have to trust me, the handlebars are about an inch higher now than they were before.