Margaret River builds for Cibilic, Callinan rematch