Questions about surfing & hotels in OCt. (SJDC)

I have been going Baja fishing since '88. Ive been to Loreta, La Paz, SJDC,Cabo, and places in between. Ive always gone solely for fishing.
But after 10 years of only occasionally surfing, I've gotten a renewed interest again. Anyways, it's been 4 years since my last trip, which btw, was a doozie! (5 days on the Sea of Cortez on a 55 ftr. out of La Paz)
I'm planning to make a trip in a few weeks and wondered if I could get some tips. I 'd like to focus mainly on surfing. I went out at Costa Azul once, and it was fun until I went to go talk with a surf fisherman after I got out of the water. I got bit by a man o' war. Ouch!. I couldnt believe something so small, could cause so much pain! And of course, at the time, I didnt know about the "pee on it" old-wives-tale remedy. Needless to say, I was out of commision the rest of the day.
So could some of you maybe help me out with recommendations? Id like to stay in the area somewhere along the Cabo/SJDC corridor. Like I said, I havent been in quite a while, and it seems like most of you really know your way around that area, and are up to date on things. SO any hotel, surfspots, restaurants, links, you could throw my way Id reatly appreciate it.
I did do some looking on the web, but every website is going to tote their hotel as the best. I just came across a hotel online, that has a nice surfbreak right out your room door... but the prices were pretty steep($170) Maybe Im in a time warp as far as room rates go being i havent had to stay in a room for close to 8 years ... I figured since plane flight prices have stayed relatively the same , the room rates would still be the same as well. Is this true? Anyone recommend any packages? In the old days, (b4 i had a computer) I'd look in the Western Outdoor News for a package deal, but now I have this. So thanks for your help in advance!