Correct 21-22 is usually very close
York and the new Batley venue have pretty short straights so you might want to drop a tooth from that. In my 4wd at the moment with the same ESC/motor I'm running the timing boost to give 15 degrees advance at 14k RPM (can't remember the exact value, second from the highest).