Diet, exercise and Actos and your're under good control. In my opinion that all points to your being a T2. But I'm not a doctor.
More important than type labels is the fact that you have good control now. If things are working, and it appears that they are, don't worry about it and keep up the good work!