You are definitely right. In your case you have a lot going on and there is many issues that can be the cause 
I have noticed a drastic drop in reboot\lockup related post since I've posted the 5Ghz "N Only" recommendation on multiple forums.
We are all waiting for the new firmware update that is in the works.