"Funny thing is this, in safe mode the phone is fine, when I reboot in regular mode it starts staying awake again, without any 3rd party apps or settings changes. That's why I now know it isn't a 3rd party app causing this."
Actually, it's just the opposite - the fact that in safe mode you're ok and in regular mode you're not means you have an app that's causing the system to stay awake.
I've dealt with these issues before. Previously, the CVS app was causing a permanent android system wakelock on my wife's phone because of a Bluetooth call it kept making - deleting the app caused the android system wakelock to end and go back to normal.
I just had a similar issue on my S7 Edge (android system being awake pretty much 100% of the time) from what I believe was inadvertently blocking system updates through Package Disabler Pro. I re-enabled all of my disabled programs, installed a system update, disabled everything again, and I no longer have the android system wakelock.
I would test by removing each app individually and seeing what happens.