Sorry about the confusion
I re-wired mine the way I found it, (may have been changed over the years)

Your diagram is correct.
The factory assembly manual confirms that

Both the I and A terminals are hot with the key on.