For working out your options with different stem choices, this tool was recently pointed out on a different C&V thread that was discussion various Nitto stems to get the bars higher. That thread may be a good starting point for you.

At minimum, plug your current stem measurements in to the tool, and work out what kind of stem geometry (angle, length, height) would get you toward your goal.

Oh, and nice bike.