To be honest, neither option is acceptable. Between the 2 options, #2 is better, but it also needs to drop a large amount if that's the direction you're going. Currently, there is no reason to run MM raids other than to get to the final boss. There should be no reason why HM and SM give guaranteed gear, and in fact HM gear actually gives better gear. 242 set piece tokens are better than random pieces; especially if they're 244 blues.
There is no reason for SM and HM raids to drop guaranteed set pieces, and MM not. If you must, make it 246. I know it sucks for you to make changes / new additions. But the best option to please hardcore raiders outside guaranteed 248 legendaries, would be making 246 purple tokens. It means new vendors / items, but these are really the only 2 options that don't make us feel unappreciated for clearing the hardest content available
BTW, non-final bosses drop 1 piece, not 2.