At this point, I almost feel like we need to start over with the idea of pipelining in CPUs, as though it were some kind of original sin. The fact that the most basic of errors in pipelined logic are referred to as "hazards" should have been a hint.

(Edit: only half kidding)