2007?
Sounds like you are a planner.
The Baja has 2000 miles of coastline, my suggestion is that you buy a copy of the "Baja Catch" by Gene Kira and also start checking the weekly fish reports on this link, as its lists many ports at all times of the year.
http://bajadestinations.com/hbarc/hbarc.htm
Late October is the best time of the year to fish the southern San Jose de Cabos for tuna, wahoo, mahi, sails, and marlin, while I prefer May for less wind in the Northern areas around Santa Rosalia for yellowtail, grouper/bass, mahi, spanish mackerel.
Both of these months are nice for weather, but October - May are the prime months.
Your salmon rods with 25 lb test will work for inshore work, but I would go to tld25's with 50 lb spectra and a topshot of mono on a stripper and roller top rod for the other species mentioned.
This will give you lots to read, and the books maps have all the inshore fishing holes, camping gear setups, and what tackle to take to make the most of your first trip. Take the book's advice as the holy gospel.