Natural spring, self irrigating, suggestions?

I have a low spot in my yard that pools up for a day or two when it rains, I started digging a trench to drain it and found that it was a natural spring and continuously releases water into the trench so I continued to trench the entire area in a zig zag pattern creating definitive high and low spots with grade creating almost a small stream with high spots in between in rows, I plan on planting on the high spots but they are still quite soggy. Should I fill the trenches with stone, pile topsoil on the highspots higher, and then plant? Or should I just plant water loving plants in the Soggyish soil? Mind you it has aeration it is not saturated, just wet. Also, is there a word for this? I dont think it would qualify as swales, Its more of a stream with highspots that are continuously wet, self irrigating maybe? Its a hard spot with the spring at the highest point and takes about 4 or 5 days for the trench to stop running, but only a day or so for the high spots to run off and become prettty airy, just wet. Plus the sod was flipped onto the high spots adding a layer of composting grass/aeration. Suggestions? I will add a picture tomorrow

Also there is a very high water table, the surrounding area is quite swampy