You suspect that degraded primers were used as primers and the original oligos were used as templates in your PCR. How long is the largest PCR product in your water controls? If it is longer than 25 bp, I would guess that your PCR was contaminated, which might be in your primer stock.