So.  I had to make two more dial fixes for the gen (for each body morph) to have them fit correctly against the morphed M4.  Hopefully this isn't something that will cause issues when he is submitted to the store.  If so, I am going to have to take them out and have people try to tweak settings themselves, which doesn't give a very good fit.  That would not make me or other people happy.