Absolutely. Repealing the 17th would be preferred.

I'm only making the observation that if you ask someone on the street if the 17th should be repealed, you'll most likely get a blank stare.
If you ask that same person if there should be term limits for congress, you will most likely get a resounding yes.
In fact, recent polls show over 70% of the population favor term limits.

I was only pointing out that there is less heavy lifting in getting term limits.

Repealing the 16th wouldn't be a bad idea either. The federal gov't should only get its funds from the states,
much like the UN only gets its funding from member nations.
Could you imagine if the UN could tax US citizens directly?