I go to the puppy kindergarten classes at petsmart and a suggestion I got that works for the whining was to put a towel or blanket over the crate and the second they let out a whine throw a tennis ball at and hit the cage so it makes a noise and keep doing it each time the dog whines. I didn't have that many tennis balls but I have TONS of shoes so I spent one afternoon doing it and now she is perfect

now she doesn't whine when I put her in or as I am walking away. She is not at the stage where her cage feels like her home and she likes to go in there to relax but hopefully that will come soon. Good luck I know it can drive you crazy + it would always make me so sad to leave thinking she was so miserable