Trouble in River City

Oh no! Smart little sheltie has decided obedience is boring and he'll spice it up a bit. Even though we don't practice the front & finish, he's put the two together and swings to heel on the recall. Gack, two weeks to pre-novice and *now* he decides to get funny?! I'm trying to re-teach him using the 'around' instead of a swing heel. But two weeks! I do not work well under pressure.