What is the actual measured compression? Using "10.1 pistons" doesn't necessarily mean the actual compression ratio is 10.1. Have you measured it?
I'd figure out what the engine actually wants for initial timing before worrying about total timing or even changing anything, parts-wise.