You do seem correct, but again, these swing state numbers do not look good at all under either scenario!
He has 17 swing states. I am sure that includes NJ, PA, and MI.