I can't help you pick out a new saw...as I am unfamilier with the new model numbers...But I will suggest that if you are considering a more powerful model, look for one that has the "Pro" designation...my story below.
I have two older stihl 024 saws with 16" bars. One of these was given to me by a friend who I was cutting wood for (before I started burning myself). He was replacing it with a new 026, he was worried that the old 024 was near it's death. I used it for years...and liked it enough to buy another one...a junker 024 from a Husky dealer that took it in on trade for a new Husky. I figured I'd use it for parts, but after I cleaned the tank and carb. the thing ran like new
6 or 7 years ago, I bought a new MS360 Pro with 20" bar. I use that the most, it cuts so much faster. The "Pro" series are lighter weight per the same HP...IIRC ? But this 360 Pro is still quite a bit heavier than an 024.
I burn about 3 cords a year, secondary heat for the house. I do cut more than that per year and sell the excess to help cover gas/oil and chains (I sold about 12 cords in the last two years, that was more than normal).
Lastly, with a properly sharpened chain, a 20" saw can cut a big log...a hundred+ year old white oak shown below.