For the mechanical disc, check out the TRP HyRd brakes, they are a excellent option if you don't want to replace the whole system to go hydraulic. I ran a bike with them back when they first came out, it was worth the cost. The bike I had them on I sold to a friend, and he is still using them and I am thinking they are close to 10 years old
__________________
Brian | 2025 Trek Checkmate | 2025 Lynskey Elysium | 2022 Trek FX Sport 5
you should learn to embrace change, and mock it's failings every step of the way.