have you had glucose tolerance tests done?
seems kind of strange to second guess a diabetes diagnosis when it is a very easy thing to get checked
it may be possible you have an adrenal issue because of the salt cravings , frequent urination is also a symptom of this sicne the body is trying to balance electrolytes.have you had the saliva adrenal test done?