Thanks for coming back to update. Congrats. Getting rid of pain hyperacusis - noxacusis - is no small feat. It is not clear from your posts if your hyperacusis had a loudness component to it and if that improved.
Sad about your tinnitus. Some got improvement after longer time, so there is hope...