Yeah MSF all the way..
I failed my motorcycle test on my XR250L (dirtbike). And had been riding for 6 years. But the lady was a
She expected me to have all the tests memorized. Which I figured she'd tell me. So that started off on a bad note. Then she said Do a U turn and stop with your front tire in the box. So I did a huge ass U - turn, nice and smooth. And stopped perfectly in the box. She said, "Well you missed points because you crossed that line, that line, and that line..." I said, "you didn't tell me that I couldn't do that." She said, "you should have known..." So yeah, I failed on the first 3 parts of the 5 part test.
But ACED the MSF one... even though I'd been riding for awhile, well worth the money, and time!! both of my friends that are getting bikes, are taking that course this month.
Oh, and you should be able to renew your permit.