I just did a tour of the South Western corner of Bolivia, it is truly an awesome place to be and ride. Hope you enjoy it as much as we did.
I note you are going to the town of Uyuni (which is a bit of dump) but not going across the Salar which is west of the town? Surely a mistake on the map? If not you really need to bug your guide to take you across it to one of the islands at least, it is one of the most unforgettable experiences you can have on a motorcycle.
cheers - Martyn