Rather than repealing the 22nd Amendment, I would be in favor of a 28th Amendment Limiting Senators and Representatives to a total of 12 years in Congress period. Whether part of it's in the Senate or House it's 12 years total.
We have it here in Oklahoma, I think it has done wonders in getting out the entrenched powers of the past.