On the issue of rotors, since you brought it up, seeing that you weigh a good 15kg more than I and seem to be bringing quite a hefty, heavy load on tour, I myself would have installed 180cm, rather than 160mm, rotors on the Storm. More breaking power, better heat dissipation and increased lifespan at the expense of minimally reduced modulation (an exaggerated non-issue in my experience with a front 180mm rotor and Deore M6100 hydraulics once pads are bedded in on my Thrill Volare minivelo) and a few additinal grams in weight. Now, this is not idle musing for I have, in fact, done exactly that on my Storm build. Here you go, 180mm rotors front and back: