I also think you’ll be happy with your decision to go with the M. I’m a few centimeters shorter than you, so similarly between S and M frames from most manufacturers, and I almost always opt for the M unless the manufacturer is known for larger than normal frame sizes. Just bought a new “downcountry” bike where I was in the same boat and opted for a M - no regrets yet on sizing.