Since you have played a Roland keyboard for years, you will probably be accustomed to the Roland sound; for this reason I advice you to try the Roland VA 5 and compare it with the Yamaha PSR 2000. The rest, like Gunnar wrote, is up to you.
_________________________
Korg Kronos 61 and PA3X-Pro76, Roland G-70, BK7-m and Integra 7, Casio PX-5S, Fender Stratocaster with Fralin pickups, Fender Stratocaster with Kinman pickups, vintage Gibson SG standard.