I currently have all Stihl 2-stroke equipment and have been more than satisfied over the years. But, in all honesty, if I were starting over today there is no doubt in my mind that I would go electric. Neighbor at the lake has the M18 trimmer that you have and I’ve used it several times, it’s everything you could ask for. I have the Dewalt version of the pole saw you mention (mainly because I already have Dewalt tools and it’s amazing what that thing will do with even a 4ah battery.
I’m sure my Stihl equipment will likely last me long enough that I’d never truly need to replace, but your last point about the Mrs. now using the equipment herself may just be the motivation needed to change!