Awesome break spot.
I'm sorry for your brakes though. C-star was a travesty. Trek + pandemic supply chains = the worst hydraulic brakes I've ever seen. Rush, Radius, Power... they're all C-Star, and they're all shit. Most warranties I've ever done on a line of components.
However Axiom was a good choice for your trunk bag and p35(?) panniers. Great warranty terms, high quality, reasonable price.
If you like your Trek FX and want to upgrade the brakes, I'd personally suggest Avid BB7s.