I feel for you, same problem with Yamaha editing registrations, except the "freeze" button is helpful in some cases.
Looks like you have enough equipment to just play just piano. Roland's piano voices are very good!