Some might cringe given that classy build but I would go cheap and just update the stem to a 25.4 Nitto technomic (modern technomic is 26 and needs a shim), or a dirt drop mt10 w/ 100 reach. That would bring you much more upright, the other changes sound fine too if you want to spend $. I have upgraded two tour like bikes to nitto dirt drops and like the bar position much better for those rides but different geometry from your EM.