Endocrinologist consult is needed
A full diagnostic work-up by an endocrinologist is needed. The saliva and hair test you had are very inaccurate, they're only good for a general screening and not for diagnostics. Full thyroid/endocrine blood panels are needed to start properly treating your body.
Thyroid levels (and any other properly diagnosed imbalances)need to be addressed together with the adrenal issues to normalize your body - only treating one issue at a time will not improve your health.
Your ND and an endocrinologist need to work in tandem, otherwise your health will not improve.
Also do an in-depth inventory of lifestyle and eating habits - keep any health providers informed about these.
See Mary Sholman's thyroid site on about.com - there's lots of information available there that can't be covered here.
Good luck, keep us up-to-date on your progress :)