@Goneski Great you found a solution for your setup and sharing it here.
Looking through the config posted I am wondering that all the menuentry sections at the bottom of the file are commented (lines starting with #) and so I would expect for those to not be used?!