usability - Alternative to a columns of checkboxes in a table

Here's the scenario: A Person has a bunch of Accounts. Accounts may (or may not) have Services attached to it depending on the type of Account. Currently there are two types of Service (indicated by Columns 1 & 2 in the pic below) but the types of Services will grow in the future (maybe up to 4-6 sort of range)

Some Account types qualify for some Services but not others, etc.

The big system constraint is that all of the Services and Accounts for the Person must be submitted together.

Here is the design proposed by the client:

To me, the suggested designs weakness seems to be the problem of growing Services.

I'm interested in alternatives.

This question provided some interesting ideas but didn't quite fit my use case:

Best UI pattern for letting a user assign items to groups