Why not just a switch? The current page layout stays as a default UI, with the option to default to something else, like the scrollable vertical app list we get when going to App Library and sliding down.
current layout is fairly useless
first 2 pages are memorable, but after that, it's too slow and hard to use, so really you only have real estate of 2 pages. pages 3 and on aren't useful.
infinite scrolling gives you muscle memory of the top 20 rows of apps, then you can fill the rest on the bottom with a mix of widgets. then you can associate apps to the widget to make it memorable. example: I can put black stocks widget on the bottom of the screen. then next to the stocks app, I have investment apps/crypto apps/wallet apps etc..so I can just quickly scroll down, eye for the big black widget, then found my crypto app. easy.