As far as I know, InfoPath only supports attaching a single file to one attachment control in a document library out of the box. Some work arounds include placing it inside a repeating table as you mentioned or using a SharePoint List instead of a document library. Otherwise, perhaps someone else has managed to accomplish this using custom code or some other means.