Yes, PLEASE revert the controller settings. The changes to quickslots and menu navigation are TERRIBLE. This isn't hyperbole - The basics of the game on controller are so tedious/unfriendly that I legit don't want to play with the current system.
I certainly won't be buying the ps5 version now if it will have these new controller settings.