You're on the right track.
Yes, there's a second TDC on the exhaust stroke.
One easy way to tell is to put your finger over the spark plug home. On the compression stroke, air will escape past it. When it stops, you're near TDC on the compression stroke. If you need to be exact, a wooden dowel in the spark plug hole can verify when the piston is at the very top of its stroke.