I am in Bolivia now on a KLR 650 and also did Baja (including the offroad).
The KLR is a very capable bike and I would say your best option if you also want to do two-up.
Screw the fork brace though, it is not worth it.
Doohicky, brakes, handprotectors and you are set.
One more reason to choose the KLR 650 would be that the old model is bound to be a cheap buy now. I bet you can find a tour ready one on Craigslist.org for a good price.
That said I wish I had a lighter bike sometimes. Especially when I have to pick it up from all my crashes (-:
But I have punished my klr and it has held up very well to it and it really is a great dual purpose bike.
The main problem is that baja, on dirt roads, is torture if you can´t stand up in the pegs. I rode a little with a couple from SF on a 990 KTM Adventure and the pillon did not enjoy it, even with the nice KTM suspension.
Lots of washboard and rocks.
Just my 2 cents
South East Asia, USA, Central and South America and Scandinavia.