definitly go with the goodrich lines, i've had them on my corolla since 98. you might try
www.toysport.com. if the calipers are original i would replace them too. but putting money into stock mk3 brakes is useless. i would do a cheap junkyard upgrade like LS400 4 piston fronts and IS300 twin piston rears or something like that. hell, 4WD toyota pickups had 4 piston fronts since the 80's and their cheap.