I have a MBP that I bought in 2014, 6 years after I bought my first MBP. I only got the new one because I messed up the main board while installing a new batter

I have a MBP that I bought in 2014, 6 years after I bought my first MBP. I only got the new one because I messed up the main board while installing a new batter on the old one. I am hoping that I am satisfied with my current one for the next couple of years at least, especially now that we are in the in-between. Sadly, I think that the OLED bar is going to be a deal breaker for me. As much as I don't want to, I am also considering a Windows laptop. The Gigabyte Aero 14 looks really good due to the long battery life that I've come to expect from the MacBook Pro.