You're right about the clumsy nature of the display, considering that there are both hard coded switches that can be on or off in admin and potentially hard coded module additions to the product listing... there is work to be done with any template out of the box.
These sites consider changing the CSS, instead of the hard code to accomplish a clean product listing display using column layout grid.
Bluu Gnome Gear
https://www.bg-gear.com/store/index....=index&cPath=1
Edmonton Grocer
https://edmontongrocer.com/shop/
Sheldrake Automotive
http://sheldrakeautomotive.com/shop/...ath=3_117_6_19
German Wholesale Parts
http://germanwholesaleparts.ca/
Once the product listing is mastered you can review the new products, featured products and so on (
preferred) or direct them to use the product listing page (
existing features and future upgrades will need to interact correctly with a one page listing output method)
For pointers simply look at the source
stylesheet.css and related files available in your web browser. You can copy the stylesheets into your own site
and if the settings are similar for each display item -
you will see the display cleaned up for a proper gallery 
Bookmarks