I've got the same problem and I've tried to wait, removing the current companion/follower but as soon as I get the quest Vilkas stays at Jovaskr and I can't get another companion. All we can do is to wait for the patch and hope the script is fixed in it.