I am an over planner as well. Seems you can make the one side two side decision once you have done one?
We will be their in May as well. A bit later in the month. We have a Zimbabwe side tour booked and well see. We will also be doing the boat. Both already booked. We also have a day to figure when the time comes. Hotel booked too.