GOP aims to fix front-loaded primary mess