Also, perform a vacuum gauge test.
Hook the gauge to full intake manifold vacuum, take careful note of the needle's actions and readings.
Check at idle, fast idle (holding at a steady RPM) and compare the two.
I would suggest try it at 16 degrees where you say it runs smoothly, and then try it...