IF you have a keyboard with arrangement facilities you wont be able to upgrade one without loosing the other. I suggest concentrating on getting a good keyboard - ie. one that a pianist would say plays well. Rig this up to your laptop and BIAB you will get excellent results. Also, its perfectly feasible to run the MIDI through a decent virtual piano - e.g. Ivory. TruePianos is decent and has a 40 day free trail.
I have had some yamaha's and am not impressed with the PSR's though some of the range may be OK.


Win 11 64, Asus Rog Strix z390 mobo, 64 gig RAM, 8700k