I think Rubio, after his misstep, learned his lesson. He was interviewed on WFLA a few weeks ago, and he said that he wants a debate on amnesty and securing the border.
That is the only thing Rubio did wrong so far.
I'm with you about Rubio. I recall back to what happened, and Schummer spoke for Rubio about Rubio's actions on the committee. It seemed like a setup. Rubio ended up getting the blame for the dirty deeds of McCain and Schummer.
Rubio has been a consistent voice for constitutional conservatives since then.