Yes. Include your prior service years. Those chart are for miiltary service not just CG service. Also, if you were National Guard or Reserve, the time only includes active duty time. So for a non deployed year in the NG you would generally have two days a month and two weeks a year which would only be a little over a month of active duty time that could be applied.
Life is hard. It's even harder when you're stupid.