Disc brakes are *so* much better.
I was in a similar situation to you and had a Lemond Poprad from 2005, Platinum OX frame. Loved the bike, didn't love the braking, especially during a couple of descents that still stand out in my mind.
Anyway, I now have a Gunnar Hyper XF and can say without hesitation that it is my most favoritist bike I've ever owned, and I've owned quite a few.