I don't think he died in Guilford Co., NC. I think he was already in Warren Co., TN by then. Land records for Warren county note a James Carrigan (various spelling's) from at least 1826-1828. These records note he owned at least 40 acres, and are all in reference to land owned by other individuals. John Carrigan is noted as the SCC on the 1827 entry. In addition to these land records, we find John Carrigan in Warren Co., TN for the 1830.
Just trying to confirm that you don't use the 1800-1810 census entries for any of your lines. KC