[HandshakeToDC] Tech debt: clk/rst inserted later than they probably should be

[teqdruid]

In #7825 I track the hw.modules which have been created then after everything is done add the clk and rst ports. This is not the desirable way to achieve this but all of the better ways I tried resulted in block args getting confused. Fix this.