Know anyone with a short stem you could borrow for a couple of rides to try?
Unfortunately not. I might get a couple and send one back / sell it on.
short stem (try 50mm) and maybe raise the handlebars with some spacers
That's a good point, I have a couple of spacers I can play with as well.