We have a good update!
So you ladies were right, he was UT. I am still working on his naps, but they are much better now and we haven't had NW in a couple of nights now. I also increased the solids and I think that also might a huge difference, he just didn't get enough.
Thank you again for your support