Sunroof removal question

[MarinerMan]

I have a sunroof that doesn’t like to close all the way, and when it does, I can’t seem to close the sunshade hatch completely. I already and going to be removing the headliner to replace it, as it when from sag to full privacy curtain mode.
Is there a /pretty/ way of removing the sunroof? I don’t want to silicone, sikaflex, 5200 it shut. The amount of smoothing seems onerous. I don’t want to rivet a sheet on top like a street racer. Is my only option a custom fabrication and weld? Or is there someone somewhere that has a solid option?

On the other hand, does someone thing I have a simple problem that would mean I don’t have to try to remove my sunroof entirely?