Dear Ray,
I own a CVP309 Polished Ebony still in mint conditions (only replaced the keyboard contacts, which is within the regular maintenance), and I pondered for a long time whether to change it with a CVP805/809 or to get a Genos.
After many tests I did on the new CVPs, I decided to keep my CVP309PE and to buy a Genos.
I'm very happy of this choice. Clavinova has a beautiful weighted keyboard and an excellent audio system. But Genos is a war machine with an unbelievable power and the best interface you can imagine, besides an incredible range of precious sounds, including piano's sounds that IMHO are more than decent.
It could also be considered that buying Genos you save about 50% comparing to Clavinova (the lack of an audio system can be easy solved with the dedicated speakers or, as in my case, with a pair of powerful Yamaha Hs8, or similar powered monitors).
Another advantage is that you can carry Genos by yourself, in your car, which is impossible with the Clavinova, unless you have an SUV or station wagon and friends available to help you.
Finally, you say you are more an arranger player than a piano player. This could be a determining factor in favor of Genos.
In both cases, you will enjoy the new purchase, since these are high-end instruments.
Ciao,
Angelo