As was mentioned above, it will be drastically improved in 16.1, with "Delete" and "Delete and Report Junk" being two separate top level buttons, rather than being a second step. But regarding your mention of two factor authentication messages, what I really wish Apple would do is add an option to automatically delete these once they are used. Obviously the OS can already identify these kinds of messages (to facilitate automatically pasting them into the site or app), and these messages are useless after that point, so why not just automatically delete them?