Patching a sunroof

[skorpioskorpio]

So just got my Jimmy for my project and one thing, it has a cheesy, ill fitting 70's sunroof in the top. You know the lip sticking up 3/4 of an inch above the top, been gooped up with RTV and caulk several times, blah blah blah...

Otherwise the top is in decent shape, solid hatch, a couple of inside load gouges, but not so bad. Is patching the sunroof hole and having it look like anything really a possibiliy? ...or is my best option to try and put a larger, better fitting unit in, or just look for a better top? Not that it matters but it looks like it's a double wall.

Also if I end up going the route of finding an uncut top, are the single wall and double wall hatches interchangable?