I've heard JD joke a few times about how he was person non grata at the Bush White House after Bush and Rove started their amnesty push in 2006. Bush and Rove did huge damage to the party after the 2004 elections.
Have to agree with your assesment. It should be incredibly interesting if amnesty is going to be a central issue in the primary.