It sounds like you're on the right track. I would suggest also adding a boating safety course into your task lists. You'll quickly find out how much more there is to learn.
Good luck and don't hesitate to ask questions.
Thanks! Are the best courses the ones offered through the coast guard auxiliary? We've looked into several that are offered in our area.