I know how upsetting it is to have them in a crate all day and all night. Have you considered an expen? It fives then more room, but they are still confined. You could use it while your home and have to cook, or do something where you can't have all your focus on him. Just a thougt.
You're right, it does get better! At this point he hasn't learned all the house rules. If you keep doing what you're doing, he'll eventually get it.