timing woes

What have you set the initial timing to? I guess you are running 10 initial/advance and getting 24-25 from the weights? Not running the aftermarket limiter plate (34 total)? If you are happy with the total, you can reduce the initial a couple degrees then allow the weights to move further.
There are electronic controls where you rotate a distributor with no advance mechanism to the total and lock it down, then the box retards for cranking and less and less as the rpm increases.