Yes, you should have D unlocked by then. I'd recommend re-speccing A and/or G to boost experience or enrollment gain.