@apollinaire ..."Then I started to play with the thought of changing bits of Yamamoto to Audio Note components (capacitors, resistors and perhaps tube sockets as I heard Yamamotos aren’t the best)"..
Here is a thought mentioned on the other thread. Skip the Yamamoto 3w+3w amp and buy an AudioNote OTO SE 10w amplifier to go along with your desired AN speakers you mention. You can order it with proven caps and resistors, no guessing and screwing around. They come up 2nd hand used rarely.
Truly - this will save you a ton of wasted time and guess work allowing you to start listening to speakers/amp/parts components inside all designed to work together from the get-go. I only share this IF your real goal is not fooling with widget component changes and more about listening to music sooner. They spend 1000s of hours testing/trying/listening to their designs.
Many of us here here swap caps/diodes/resistors thinking we can outsmart the original amp designers, and it works sometimes, not all of the time. In the case of AudioNote amps/speakers working together well, Peter and team at AN truly know what they are doing. Go listen and compare at a show if you can somehow. Just a timesaver tip fwiw, best of luck.