In japan all manga that features M/M relationship are called 'BL', it has sex it's hard BL, no sex, light BL. So technically it's still yaoi. A few years ago 'shounen-ai' manga mostly categorized shoujo manga that had BL undertones, like Silver Diamond or Uraboku. Honestly these terms are outdated.
i just sat down and read all over again.........
i should make good decisions like this more often(╯°Д °)╯╧╧