I will revert includes/modules/YOUR_TEMPLATE_FOLDER/product_listing.php (based on the ~ Column Layout Grid for Product Listing copy) to see if the problem goes away.

But you missed what I said about includes/templates/YOUR_TEMPLATE_FOLDER/templates/tpl_modules_product_listing.php~. This is broken.