I think 24 initial would be too much timing. I would take one thing at a time here. If the RPM is wandering or hunting at idle, I would think that is a lean condition. A fat condition would load up and die at some point.