Sutro Tours no longer exists in downtown Kigali. Even in the bus mall it doesn’t exist, but there are some good options to Nyamata. I took Safari Tours this morning and then Ugusenga (or something like that) tonight.
Also, the big craft store across from the trade centre either doesn’t exist or is blocked off by advertising signs. I didn’t bother exploring every street but definitely no access to it off the main roads.