Jazzmaster wiring scheme - please verify

[Tyrannocaster]

EDIT: Edited title to reflect fact that I now have a proposed layout, which is in the next message.

These things drive me nuts! I spend more time trying to figure out guitar circuits than amps and amps are a lot more complex! Anyway, I want to wire my Jazzmaster in a non-standard way, having spent many decades living with a wiring scheme that I think is close to useless. I've attached the Duncan JM diagram below.

With the standard wiring as shown you get two circuits, one a more or less "normal" one (like a Tele, say) with a three way toggle pickup selector, volume & tone but there's also the so-called "rhythm circuit" which gives you volume and tone (darker than the standard circuit) and only allows you to play the rhythm pickup.

What I want is quite different, and I got the idea from this post, which shows you how to wire one of these up with two different tone circuits where the rhythm circuit is normally, using its switch to select the normal or dark tone: http://www.guitarwiring.blogspot.com/search/label/Jazzmaster Only this one changes the "Tele" circuit too, giving you separate volume pots for each pup, which I don't want.

So what I want would have a three way pickup selector just like the stock unit, a volume control (just like stock) and tone (a Bass cut à la G&L Legacy - easy to do and I don't need help with that part), and the "rhythm circuit" would now have two different tone controls (normal and dark) selected by what is now the rhythm circuit switch - there would be no separate rhythm volume control.

Where I get confused is with the switching for the tone pots; the pickup selector is a piece of cake but the other switch...I need someone who is not as dimensionally challenged as I am to visualize how this can be done, LOL.

Anybody care to take a shot at this?

[Tyrannocaster]

I think I have it figured out. I am lousy at Rubik's Cube, too.  

Would somebody look this over and tell me if I did anything major wrong? The Bass control is wired backwards because I think of it like the Jaguar's Strangle switch - you turn the knob up to cut the bass. Also, the G&L Legacy's Bass control requires a funny taper 1 meg pot and you can approximate it by using a 1 meg audio wired backwards. (It's not a reverse audio pot, but supposedly that's closer than anything else.)