Head winds or "resistance training" as was mentioned sure does make commutes a lot less fun unless you enjoy the boredom of slow speeds and increased pain.
Yesterday with a tail wind I rode 20km in just under 27 minutes which is an average of around 39km/hr. It was great fun and a good workout with 58.7km/h max speed.
I turned around and it was a whole new ball game with exhausted legs.
The same trip back took me 56:26 with an average of 22.1km/h. Max speed was 38.9 on a downhill.
Just go with the flow and try to reduce drag going into the wind. I guess aerobars help by about 2-3km/h so that helps a lot. Consider them if you can.