Weener Wah II advanced Outboard Wiring

[Marshall Arts]

I am trying to wire up the boost part of a Weener Wah II to have the option to

A) switch the boost on (or bypass it) and
B) when the boost is active, have another switch to select whether it will only be active when the wah is engaged or also in wah bypass mode.

The idea of B) is to use the weener as the only pedal in front of a single-channel amp that asks for some extra boost even when the wah is not active (permanent boost).

I thought that the attaced image would be the solution, unfortunately I did not see, that for mode B) the guitar signal is directly connected to the output of the wah section of the Weener II, which has some impact (slight Wah effect, filter etc.) on the guitar signal.

Any Ideas? To make things more complicated, I am using a 1776 Finish Line instead of a "real" 3PDT (which I could than use to break the connection between Wah Out and Boost in in Bypass mode and skip the idea of an indicator LED).