With your 10+ years of riding experience, you probably have your seat height dialed in. But when I hear about knees getting sore mid-ride, seat height comes to mind.
So, the new bike could be an oppotunity to revisit seat height. Just as an experiment, you might mention your knees to the dealer...