Yep. I'd say Amazon should be split at least four ways: AWS, their delivery/fulfillment operation, the web shopping platform, and the "Amazon Basics" and other product brands.

Edit: just saw that ihaveajob posted the same idea in another reply.