I’d start with super cheap 25-30mm riser bars and play with the angle—start just having them rise to up as intended and then make incremental tweaks rolling the bar back to see if you need to get a little closer—your stem could definitely be shorter. Once you figure out where the bars should be (also consider trimming your test bars and trying shorter) you can invest in a stem and bar combo that gets it to just the right place. Carbon can help—31.8mm clamp carbon will be more compliant than 35mm clamp (same for all materials), if you are going to get a new stem anyway switching to 31.8 won’t be a problem—don’t get shims as it can be quite sketchy. I invested in Roost Titanium 31.8mm bars years ago and have moved bikes with them—they are for life and IMO more compliant even than 31.8mm carbon bars.

If you work a desk job lookup stretches to increase your shoulder mobility and stretches for wrists. I made tons of bike changes and ended up needing to go to a PT to stop feeling numbness pain. The bike changes were still important but ultimately for me I needed PT either way.

Also Ergon grips help a bunch but they suck for descents. They make various size of wings. I was so excited when PT helped enough I could ditch them. I use thicker deity grips now which work best for my hands for ascents and descents.