Have your LBS check your rim then forget about upgrading your brakes. Some day you will decide that you can't live without a completely new frame with a complete DA group. Worry about the brakes then.