Hi Shane, much better!
And you’re right, those yellow lines couldn’t be removed the way I had imagined it.
But here’s an alternative (not saying it’s better, but I think it’s ‘pretty’):

Has some nasty 6-sided Poles, but they’re in a flat area and don’t cause any problems here.