Uganda 2 nights, 3 days will be possible when you fly inn and out from Rwanda, Below is travel plan:
DAY 1: Arrive kigali transfer to bwindi ruhija, nshonji and nkuringo [4,4and 5 hours drive respectively]
DAY 2: Gorilla tracking, afterwords transfer to lake bunyonyi [1.5 hours and 2.5 hours drive]
DAY 3: Transfer back to kigali targeting for your fright time.
OPTION B: GORILLA TRACKING PARC NATIONALE DES VOLCANO [RWANDA]
DAY 1: Arrive kigali transfer to park [2.5 hour drive]
DAY 2:Gorilla tracking, optional activity will be to visit Iryawacu cultural centre
DAY 3 :Optional morning golden monkey tracking afterwords transfer back to kigali/ you can depart volcano park in the morning such that you can have time to visit Genocide museum in kigali and the Caplaki craft market before transfer to the airport.
Enjoy mountain gorilla tracking!