I think I would keep fitting all the pieces and finish the mock up. Once everything is in place and fits properly, then I would take everything apart and start prepping for primer...

As for the 36 grit surface, couple of ways you could go here... You could put a skim coat of filler and start blocking, or do some more work with 60 grit to start getting the surface smoothed out.....