Also M1 Pro here. Any reason why you're planning to upgrade at M7 Pro? I still don't feel the need to upgrade, as much as I wish I could justify it.
I like to factory reset my devices every couple of years, it really gives them a new lease on life. My M1 Pro feels as smooth and fast as the day I got it.
I think the rumors are the M6 and then later M7 Pro/Max will be put into a new chassis with a touchscreen and no notch.