I can draw a schematic to help you - but I just wanted to get some info to make sure its going in the right direction... There's umpteen ways to do this, and it really boils down to your preferences.
The push pulls will work, but remember that with the choke bypass there are three potential settings you can have. So since the push/pulls only offer two positions maybe do two push/pulls? one to toggle between between the original baritone and beefcake modes, and the other to toggle the choke bypass.
What would go in place of the rotary switch? Do you want that to do pickup selection? (also- do you have the original switch? there are alternatives I can point you to if not)
Also, if you want some help to debug the split coil thing try to shoot some closeups of the wiring and post them here or send 'em to me. I assume that is for this same bass? If so (and assuming you get it working) a third push/pull could switch between series and parallel mud modes. IMO, the signal coil sounded just like the parallel mode - but with hum
(i.e. not really worth implementing)