Yes, the '05 and '07 frames are the same. You would want to keep the CDIs with the motors, but the late '05+ CDIs mount different and use a different connector system in the harness. If both CDIs mount inside the airboxs, your good to go. BTW, the '05 would then be the dual map CDI.