We have just returned from two weeks visit (mainly work) in Rwanda. We had immense use of your guide. You invite us to give comments and here they are:
1. We think that you underestimate how strenuous the gorilla trip is. We are two 61 y/o fit and well persons, bicycling to work each day and still we had to take brakes due to problems with breathing. There is no possibility to pick an easy team; you are allocated irrespective your condition, at least if you look more or less normal. The price is now $ 500 per person for a permit to the gorillas.
2. Gorillas nest lodge is expensive ($ 250) and lousy, so is the food.
3. In Kigali, you could mention the Memorial for the 10 Belgium UN soldiers located in the barracks where they were killed, close to Serena Hotel (formerly the Intercontinental).
4. For eating in Kigali we can recommend Bourbon Cafe, modern african (slightly Starbuck influenced) with wireless internet. In the same building there is a supermarket open 24 hours. The restaurant in Serena Hotel in the basement is modest in prices and serves a good buffet.