This is what I did too...whenever I kill a starter I just take the dead one back and they replace it, no questions asked. I have used the CRAP out of that lifetime guarantee, killing a starter every 4 years or so, 21 years and counting, LOL!
My timing is locked at 34° and the headers cook the starter over time...but that's ok, it only takes 15-20 minutes to swap out, and if I recall correctly I paid less than 40 bucks for one back in 1993...one of the best investments I ever made. :D