Bolisk,
If you are using the stock distributor, then it was not meant to reach 36* at 3,000 RPM. Your key is to play with the "ported" signal going to the canister. Those stock settings you posted earlier guide you towards this. I sometimes "forget" that 3,000 RPM is not even close to WOT. And...