I don't know the prescribed treatment for Rupp or Goucher.
As for your dietary split, you may want to check your math, 70 + 20 + 25 = 115
Though, I get what you're saying - as far as I know, high carbs are called for with hyperthyroid. Unfortunately, a diet for endocrine problems is outside the scope of my knowledge. All I know for your case would be get more zinc, high carbs and fish, which it seems you already know.