Have you tried giving him time to unwind when he gets home? My dad use to to always come home mad/grouchy. He told my mom to give him time to unwind. So maybe 30 minutes to an hour then he would be fine. It might be something to try.