@
rpenmanparker: Thanks, I completely forgot about that! I did nudge the seat forward a little bit and there is a difference. I'll probably still end up getting a shorter stem, but I went out for a nice long ride today and it was markedly more comfortable than before. Still a touch bit stretched out, but my arms and shoulders are getting used to it pretty quick I think.
The only thing that desperately needs changing is the saddle. At first I thought it wasn't bad, but after spending close to three hours on the bike today that's just not the case. It feels like Thor drop-kicked my pelvis.