Yeah, I think it really comes down to taste. Doc loves his 12AU7's, and I totally understand that when we cue up tape and listen. PJ is pretty into 6SN7's (as is Ed Fallon), and in PJ's case I think it's reflective of his preference for musicality. In my case, I might go for a 6414 or something like that, except that gain is an issue, so wiring for 5687's or ECC99's seems like a good choice.
Putting in a switch for the filaments seems easy enough and like a good plan. With the Speedball installed, you should be able to switch between 6CG7/6FQ7, 12AU7, and 12BH7 without tremendous voltage mismatch between the driver tube and the output tube.