Give serious thought to BB7's with a good lever like Cane Creek Direct Waves. I don't miss, one bit, the problems of sticking calipers, brake fade on hard descents, bleeding fluid, water in the line, etc.
BB7 allows the independant pad adjustment of both sides - super easy and they are powerful. On my loaded-arse bike with all the bags I have zero trouble bringing my rig to a stop. Just get the best compressionless cable housing you can find and the lever feel is nice.
Sure-sure, they aren't new tech and all bling-blingy.... but they sure do work!