I would be happy to look at whatever calculations you make w.r.t. the filter. You can post them here or e-mail me directly.

If you want to easily remove the filter from the network, all you need to do it pull out the resistor and put in a short piece of speaker wire effectively by-passing the inductor. Might save you the cost off a switch. Either way would work well.

Martin