Hey again Dave,
I forgot to commit on the change to the "angles", as you can see I simply changed from 45 to 55 degrees which adds all the needed extra room and it does exactly what you stated, makes the tracks run more in line with the layout. I think it looks great now.