Yes! You are correct.

In step 6, two NADH molecules are created. This reaction happens twice, because there are two GADP molecules for each glucose.