I must admit that if it had been me I would maybe have done both of these but I would have done them one at a time to see which had the effect.
Predetonation I would have imagined coming from the timing being slightly too advanced, yet you have advanced the timing but you have done that and it has gone away.

It also used to happen when cars first started using lead-free petrol, to the point that a backfire exploded W's BX's front box!
So I retarded it by much more than was originally thought it ought to be. (Later figures given out showed the earlier ones to have been too conservative.) So what fuel are you using?
Changing the dashpot oil would affect it on acceleration and if that is when it used to happen then you would be momentarily making the mix richer than before which I think would also stop it preigniting, but I am not sure on this.
Have you tried the old skool way of measuring the power of your engine under road conditions?
i.e. getting someone to time with a stop watch how long it takes to accelerate from one speed to another while remaining in top gear??
This used to be in all the old skool Haynes Manuals. And not changing gear makes that not a factor. Say from 30 mph to 60?
Done a few times, either on the flat or up a hill, if you can, starting always from the same point?