In your scenario I make the apparent wind 22.4mph from 26.6 degrees off your heading (just shy of your 1:00) so your numbers are good.
I understand how much the wind sucks, especially now that I mostly commute on my lowracer recumbent. We get the afternoon nor-easter here in summer which blows consistently most days and peaks in strength right at my home commute time which happens to be directly into it along a long, exposed stretch of freeway. I often cruise by groups of hardcore roadies pacelining into that headwind and recall how frustrating some of my commutes used to be. These days I save the fully fendered Surly for the rainy days.
Edit: I'd kill for a NoComm along that commute... one day maybe
