Prime for Prime ODLH is about a Sky Scraper higher than Diaz. So, no, Diaz doesn't need to be shot to make Pac look good.
De La Hoya wasn't the same De La Hoya that fought Mayweather, even though he was clearly no prime De La Hoya in both fights. Coming into the fight at 145 was the writing on the wall to attest to the fact that something was seriously wrong. However Manny disected him meticulously and relentlessly, for that i have to give him props. So even when its both, I'll vote Pacman was that good.