Yeah that seems like the way to go. Thats the rewiring part I mentioned. With the pigtails coming out of the body for the tails there's no way to separate them there. But running a link from the 3rd would solve the brake light issue.. Same thing for the 11-13 edge tail light swap be that a bit more involved but u get the idea