It sounds like you are doing well. Just remember that when he is rubbing against you, he is frantically scent-marking you so that he feels like you are HIS...move away from him at times like this very slowly and gently. More and more I think that the initial bite was not out of anger, but an attempt to keep you with him. The ONLY method he has to do that are, after all, teeth and claws.