I rewired my CU22 with 5-way rotary to a 3-way toggle with push/pull tone pot, McCarty switching style. I’m super happy with the results. Much easier than I expected. Also, thank you @gush for the clarification regarding the grounding of the pickups not displayed in the wiring diagrams. Here’s the final results. Forgive the bad lighting. Since I had to order parts, I added a pair or lampshade knobs. I like those both in looks and feel better than the stock speed knobs.