F Rod, you've been here on the forum long enough to know and remember our favorite small engine mechanic spkplg. I believe he still follows the forum, just chooses not to post.
I can imagine he may be smiling and nodding that you are on the right track with your repair.
One of my strongest hobbies is also small engine repair. I'm particularly enamored by 2 strokes, with chain saws topping the list.
BTW, ole' sparky could, and hopefully still does, grow a pond full of dandy HBG.