I agree. I'd start with the numbers above.
Of course, timing will change with each engine/combo. Having said that. 20* initial is WAY too much in most cases, and usually you don't want full advance before 3000RPM. A lot of people will suggest to wait until 3500RPM for full advance just...