Sorry about the confusion. The spokes broke on my rim-brake bike… which led me to thoughts about more tools - even one for truing rotors on my new disc bike which has still to leave on its maiden voyage.
I confuse them myself!
... ...
So, you broke a bunch of spokes on your 36 spoke wheels. Thus replacing the wheels with 32 spoke wheels on the new bike? Ok.
The two bikes really look so similar it took me several seconds to realize that they were different bikes.
Is there a reason that the new bike has both brifters and bar end shifters?