Couple of questions about crate training a puppy?

To answer your question yes you are on the right track as long as he wines leave him in there. I know it's annoying but you train him don't let him train you. He may not calm more quickly but he'll learn to eventually calm down.