Why do you have to switch? Nothing wrong with having both.

Or add a suspension fork to your current ride, fatter tires or a tubeless setup that lets you run lower pressure. Or a dropper post to let you get a little different position when on the steeps. Shorter stem/wider bar combo can also help with some of this maybe.