Didn't even know that forum existed! Good solid fix 👍
Yes that's largely what I did 8 years ago. Your site is more in depth and in hindsight I "shoulda" done it that way and only had to do it once. You can bet the fixes I did back then are OK and more/other places have wiring/solder discontinuity.