Why didn't you just fire up that iron Jenny and use it in conjunction with the sails? As for the motor's power, yep 8-HP would be fine on a cal day with no tide, but the boat is still underpowered IMO. My old 27 Catalina had a 30-HP Atomic-4 in her and I never had a problem with conditions such as those you described. However, I have a friend who had a Catalina 30-T that had a puny 11-HP diesel. He had to wait for slack tide sometimes in order to get up the channel to the marina, and that was with just a 15-MPH wind and 3-knot tide.
Good luck on your trip back home,