Yup, he went about it right. Took least invasive method to get it freed up without damage, then methodically one by one worked out the various issues.
He found a problem with the OEM main in-line fuse holder. I had a similar problem with my 1971 Honda CB100 with exact same fuse holder. I improved the electrical reliability by replacing it with a modern mini-blade fuse socket with cover. Even though I violated rules in maintaining "original", I felt this worth it since it is a rider. Cheaply made, that tubular fuse holder is a weak link in these old bikes.