I'm no expert, but the fact that I had some of your symptoms pre-diagnosis (i.e. blurred vision and thirst) would lead me to the type II diagnosis. However, your HBA1C reading is at the worst pre diabetic, so It's difficult to reconcile that with your high random readings.
Whatever the issue...