I have done the mod u described in my 32R, pretty much same thing, ditched front and rear solenoids and associated pipes, de-pinned the green wire from smaller of the Hicas plug that trigger the cluster light
Sorry to hear bout ur issues, have u isolated what's knocking., u welcome to try my Hicas ecu though I'm near parra