I'd leave it as is and back off your total number until you get the knock under control and see where you land.

Nobody can tell you what the engine wants for initial. If it starts and runs with 25, so be it. I have a couple engines that have 24-26 initial, no pinging because the total number and curve are right.