No, I'm using the same ep016 idler.

No way in the world would the stock one would work.....

My water pump pulley was machined down too. The gap in your pic looks exactly like mine....