Well....... In general, I would agree, except in this case, perhaps simply inserting flop could cause some unforseen effects. If the original signal has rise and fall times in the 50-100ns range, and the flop is in the 5-10ns range, there might be some EM issues. BUT, the way to fix those issues is by doing exactly what you stated.