Reduce query count for product list page

Avoids lookups like that are essentially
"product.stockrecord.product" by passing both the stock record and
product where appropriate.

move product arg to the end, to not break existing code, if any