2 weeks in Uganda and Rwanda

I'm coming towards the end of my trip in Africa. I unfortnately only have 2 weeks to spnd in Uganda and Rwanda. I've already seen some amazing beaches (entire Southern and Eastern coast), waterfalls (Vic Falls), mountains (Mulanje, Kilimanjaro, Drakensberg), lakes (Lake Malawi), wildlife (Serengeti, Botswana), rafting (Zambezi in September) and although I wouldn't mind some of the things again I would like to make the best of my 2 short weeks. I was thinking gorillas in Rwanda, Kampala, Kigali, Murchison Falls, maybe Sipi falls or Lake Bunyoni or Jinja (what else in Jinja besides rafting?). Open to suggestions...