A suggestion I'd makre wrt to the resi sub panel job is to think about the next project (the genset/ats) and isolate the circuits most likely to be fed by the undersized genset the customer will want to install.
As to the comm'l job, all branch circuit wires associated should be only in the panel they originate from.