Rain and sunshine switch faulty ?

[101racing]

We have been ongoing trying to figure out the power difference between an 06 300 and an 08 300. The 06 always had way more off idle torque and we tried everything to match the 08 to the 06. I had checked the continuity of the rain mode switch several times and everything was good.Continuity in sunshine and broken circuit in rain mode. I would ride the 08 in sunshine and switch to rain with no noticeable difference. Today I bipassed the switch and connected the 2 stub wires together to simulate the sunshine map and the motor is way stronger. Don't know if the switch is weak or if there is something gone with the wiring but I'm not plugging it back in.
Now we are going to play with some base gaskets and power valve spring shims and head quinch.
I'm tempted to try uncovering the transfer ports with added base and shaving the head for more compression but don't want to lose any bottom end power to gain top. Any opinions welcome. Thanks