OK, so here's my sketch of what I think you were thinking. Please let me know if this is the same way you wired it...
Just to keep it simple, I drew it up with only a forced "on" position using an ON/OFF switch. Looks like it should work perfectly:
1. PCM off and switch off - new wiring is invisible to the PCM
2. PCM on and switch off - PCM activates new relay which in turn activates fan relay / PCM isolated by new relay
3. PCM off and switch on - switch activates fan relay / PCM isolated by new relay
4. PCM on and switch on - fan relay activated by both new relay and switch / PCM isolated by new relay
To allow for a forced "off" position, you would simply use an ON/OFF/ON switch. One ON input would be connected to ground as shown in the diagram, the other ON input would be connected to the load side of the new relay, and the switch output would go to the coil side of the fan relay.
The only thing I'm not liking about this is that I've already wired up my Fan Override switch in my overhead console, and it is wired to switch 12V+. This means I either have to wire in a second new relay (12V+ activated, grounded on the load side) in place of the switch in the above diagram, or I need to take down my OHC and rewire the switch to send a ground signal instead...