You can use either, running the stagea lines means you will have to pull the "olive" out of the caliper (its the thing at the bottom of the bolt hole)
lip on the rotor?
did you bed them in? (5-10 really hard stops from 100km/h to 50, then cruise at constant speed for 5 mins, using no brakes during that time)