I had Tektro's as well, they do suck.

Kool Stop Salmon Pads will help, then scour Craig's List, Ebay, and other cycling related purchase websites until you find a good deal on a pair of Ultegra level brakes. Regardless of what other's say, the difference in braking is noticeable on the higher end brakes versus the Tektro and other lower end calipers.