Good advice that^

I've done both versions a few times and by far my preferred version was the riveted one. Having said that MikeB used the OE panel and welded in panels/brackets underneath, then using mastic or similar to seal the gap. Neat, tidy and functional.