Add an Autotap or some kind of scanner to that list.....
Yeah, the downpipe is what you need, just getting rid of the Ubend is only part of the problem with the stock downpipe, it is restrictive at the opening, an aftermarket one is a full three inches. Why the water pump? Is yours going bad or something?