I agree with Cugel
Listen to the body it will tell you what is happening and when you should back off.
I’m a great believer in changing the cassette to suit the terrain. Use the big ring for normal riding and get a 16 smallest sprocket with one tooth jumps. You do most of your riding on a flat area, so don’t need anything smaller.
It allows a consistency of effort.
Enjoy your riding.