Yeah, T-Mobile and Samsung US have kinda said that there will be Oreo coming for the Note5 and the S6. Not sure about international variants. Lets wait and see.
Try flashing the original firmware using Odin. Original firmware can be found on either Smart Switch or Sammobile. Backup before flashing original firmware because doing this will erase your data.
