I'm planning on selling my laptop and this is the build I've been looking at to replace it:
https://www.youtube.com/watch?v=wmuNTpKGOZU
It might give you some upgrade ideas. Your build seems nice and a good base to work with, too.