Creating kits with matrix items

I wasn't sure where to post this so I thought I'd give it a shot here. We sell teddy bears with customized shirts. The bears are inventory items, as are the shirts. The shirts come in several colors.

I want to be able to create a kit that shows a bear with shirt, and then have the different shirt colors be in a drop down box. Then to have this shown as one item during the checkout or on the invoice.

I'm doing this currently using non-inventory items that I created for each kit and making a custom field with colors for the shirt color drop down box. But then every time an order comes in I have to manually edit it and separate the item to two inventory items, a bear and a shirt, thus showing different line items and separate prices. I find this a cumbersome solution and not what we want to show in the line item.