I've spent quite a bit of time in Baja and can say for sure that you guys are doing it right.
That's the Baja I love.
Too bad about the Green Door ride being all torn up,when its not its really enjoyable sand two track riding. Might take it a few years of wind and rain to recover.
On a better note, I took a little break from my travels last March and of course went to Baja. The Calamajue wash was in the best condition I have ever seen it. The flooding from the hurricanes the season before really cleaned it up. We were making fresh tracks all the way through, it was like breaking trail, epic.