Best Product Catalog Plugin

I am looking for a plugin that does the following:

Allows you to add products individually and create custom fields
Allows the products to be grouped into catalogs/groups

I am making a page for a company that sells a product in store, not online. So all I need in a plugin that allows me to show the products, group them together, and it has the ability to display individual product pages which I can customize. (eCommerce ability is not important)

I just purchased Ultimate Product Catalogue which did everything I needed except I couldn’t add images as a fields on the product display pages! Such a let down. So is there anything out there that is similar to Ultimate Product Catalogue, but allows me to add images as custom fields?