Toy storage HELP!

Please help me before I pull out my hair! My 3yo has so many toys that he loves, but it’s impossible to keep them organized! We currently use round collapsible storage bins to separate his random toys, stuffed animals, trucks, and balls (4 bins total). I also have a cube storage shelf (similar to the picture below) where I keep a few of his puzzles/stacking toys and all of his books. The shelf works, but I hate the round bins because you can easily see the toys sticking out so it looks cluttered. My only issue with the shelf below is that many of his toys are too bulky to fit in the small cubes. I like everything to be tucked away and hidden because our “playroom” is also our family room where we spend most of our time.

Should I get a regular old fashioned toy box? If so, which one? Do you have other storage solutions that you love?