It is better to have option for one Payment for one Invoice even if multiple Invoices are eligible for combining into one Payment.
We can add ability to select the "One Payment per Invoice" option in both the Payment Selection window and the Payment Selection (Manual) windows, if this option selected then it create payment per invoice.