Bolted bracket in a weldment?

I'm working on a project for school in which I have a simple frame for what will be a 4x8 gantry style router. It has 4 legs on each side that not only support the table but also the 2 top rails that the gantry slides will be mounted on. I modeled the frame as a weldment even though I want it to actually be bolted together. My idea is so that it can be easily disassembled and also to minimize distortion from welding (this applies to the top rail only). My question is how should I create the brackets and put the holes in them? The way I have it now is I created the first bracket as a new part in an assembly that also contains the frame/weldment. I referenced the edges of the cut structural members so that the brackets will update if those members are changed. should I put the holes in in assembly mode or should I do them in part mode? Ideally I want to create one bracket then insert additional instances where they are needed (there are a total of 16 needed). but I need the holed to be in place in the weldment part which comes before the bracket part so that when I break the individual pieces out on the drawings the holes are properly represented. This is my first time trying an assembly this way and it is proving to be tougher than I thought. thanks for your help.

SolidworksWeldments