Having a similar problem except I think my problem's with my bottom bracket. Water makes it less and makes it go away, oiling will make it go away for a few hours... but it always returns. Can't replicate it while stationary.
Just planning on replacing it in the near future. How much were your pedals? Perhaps it'd be worth it to just replace the darn things?