I am replacing the outlets for my garbage disposal/dishwasher circuit in my kitchen. Currently on that breaker there is one non-GFCI outlet with a pigtailed switch controlling the garbage disposal and one non-switched GFCI outlet controlling the dishwasher. The garbage disposal outlet is currently not in series with the dishwasher outlet, but is "upstream" of it in relation to current coming from the breaker box.

I want to install GFCI protection for both of these outlets. I would also like to replace the current GFCI outlet behind the dishwasher with a normal outlet, so that if it trips, I won't have to remove the dishwasher to reset the outlet. Ideally, I would like to install a GFCI outlet for the current garbage disposal outlet, and have it protect both the garbage disposal and dishwasher outlets. However, there is a catch with this plan. I still need the garbage disposal outlet to be switch-activated, but I do not want that switch to also activate the dishwasher outlet.

In short, how can I wire my new outlets to achieve these goals:

1. GFCI protection for both outlets.
2. No GFCI outlet behind the dishwasher (for easy resetting without dishwasher removal).
3. The switch only toggling the garbage disposal outlet and not the dishwasher outlet.

I've thought about this for several days, and it may be impossible in my current wiring situation. If it is, what other solutions would achieve the same effect as listed above? Should I investigate adding a GFCI breaker for that circuit? Am I going to need to run some more wire through the walls?

Edit: Here is a diagram of the current wiring situation.

![Circuit diagram of current wiring schematic](https://i.stack.imgur.com/bu8aD.png)