How difficult is it to travel to Uganda? To Rwanda?

I am currently planning a privately guided birding trip for my husband and myself. We are first deciding if we want to go at all and then, if we do want to go, trying to choose between simply going to Uganda for 14 days for or Rwanda and Uganda for 18 days total (4 in Rwanda and 14 in Uganda). (We would take a one-way flight from Kigali to Entebba. No intention of attempting to drive from Rwanda to Uganda).

Can anyone who has travelled to Uganda/Rwanda recently report on how difficult it is -- in terms visas, safety, roads (we will have a driver) and anything else you can think of?

We already know that we will need Malaria prophylaxis and we already have Yellow Fever vaccinations.

I remember reading that Uganda has the precise dates of entry and exit on their visa, but maybe this is incorrect? Maybe it is just a general 3 month or 6 month tourist visa? In any case, we had a horrible time with exact exit date visas in Russia some ago (we missed a flight and nearly ended up in deep shit -- we were only saved by pure luck. Never ever ever want to be in that situation again).