How are you transferring? I just think Magashi is a long way to go for 2 nights (and worthy of 3). If in the budget, you can spend 3 nights in VNP, still do your 2 gorilla treks and 1 golden monkey trek and then heli to Magashi after your golden monkey trek.
Yes, have stayed at all the major players in Rwanda. Have not personally stayed at Five Volcanoes, but have but a number of clients there and all were pleased.