From my research it seems like I'm on the right track but want to be sure before I start cutting wires, etc.
The caps marked 2+2 (double cap) I'm replacing with the new yellow 2uf caps tied together as shown in bottom pic. The other cap I'm replacing with same 8uf type cap.
Looks pretty...