Welcome to the forums. To answer your last question first, no, that would be necessary to roll back. However, I would suggest you give N a chance, lots of us are using it with good success. Notifications are one of the things that N made more difficult because there are more settings to deal with, as well as battery optimization which also affects those. I will move your post to the S6 forum, you should get more help there from fellow owners.
If you need additional help or have more questions or details to share, please join the site so you can reply in this thread. See
this link for instructions on how to join Android Central.