One thing that jumps out at me is you re-used the drum booster. A drum booster will not provide enough boost for discs in a heavy stop. It will work for normal use but not give enough braking whn you really need it.

I don't really think that's your problem, though, but it's something to investigate and correct.