Question on Payment Terms Preference

I've successfully set up a basic preference to override the payment terms whenever an item from a group is sold to a particular customer.  I see the F4211 updated with the correct payment term and instrument. 

The issue I'm having is if I add another item to the order that isn't part of that preference group, it's using the default payment terms which is causing two separate invoices to be created. 

Is there a way in JDE to have the preference update all lines if one has been processed?  Or to update the F4201 instead?  I can't really create a basket to manage this, since the items can vary.