I would just leave it the way it was. Everything was more or less hardwired no?

Neither way is up to code. Garbage disposal and dishwasher should be on their on designated 15 amp ccts. If you only have one cct, just put it back the way it was. Don’t add receptacles.