Assistance in identifying a film

[Mindy Varner]

Hello all,
Since we're on the topic of J-horror, I'm seeking assistance in identifing a
film that I was shown a number of years ago while in Japan (around 1999).  I
thought it was titled Kaidan or Kwaidan, but it is not the 1964 Masaki
Kobayashi of the same title. Like the Kobayashi film, it may have been a
collection of short pieces (then again, maybe not-- some years have now
passed!) 

I vividly recall one scene where a man who has killed his wife is confronted
by her spirit/corpse when a wagon he has pushed into the river springs out
of the water, terrifying him. There is also an appearance of a rokurokubi
(woman whose neck becomes serpentine with her head extending out before her
body, terrifying two men).  Does this ring a bell with anyone?  I would love
to know what this film actually is and obtain a copy. From the style of the
production, I'd guess it was produced in the late 1960s or early 1970s. It
was in color.

Any leads would be most appreciated!

Mindy Varner