See image for my proposed solution. I'd like to know if this is considered correct.
My house is 84 years old and I am certainly inheriting many sins so please keep that in mind. While I may not be able to reach today's code with the constraints I have, anything will be better than how it was before this.
I am having to replace my dishwasher, and what I found was a single circuit with a single GFCI outlet above counter which was improperly wired, meaning all the connections were made to the line side of the GFCI, and nothing was connected to the load side. From the line side of the GFCI, one connection went through a switch which was hardwired to the disposal, and a separate hardwire went to the dishwasher. Probably been this way for 10-15 years I'm guessing.
I'd like to get to a GCFI protected half-hot outlet under the sink and eliminate the hardwires for the disposal and dishwasher. Circuit is currently all 12-2 and a 20A breaker.
NOTE: Grounding conductor not drawn, just to keep the diagram readable
