Got the bike back Monday, have ridden it twice, no more skipping. Don't know what to make of all this. Just glad it's working again. I probably need to invest time in understand how my bike works if I'm going to ride it this much.