You know, set your goal based on fuel type and budget. You already have supporting mods and a direction. It's been almost 5yrs since my rebuild and options have changed quite a bit. Z1 for instance, no longer offers rebuilds on their site. Forget building to a schedule based on the calendar, everything is based on parts availability. My advice is to keep as much as possible local just to reduce shipping expenses and risks.