Which package for golf course design?

Question

Hi - as a golf course architect I'm looking at which software package to move on to from PowerCivil now that it's been discontinued. OpenSite looks to be good, but having seen a few intro videos it seems to be automation-heavy, for engineered site development etc. We work with far more organic shapes so I'm looking for something that gives me ease and realtime feedback on contour manipulation 
 What I need to achieve : 
 
 Golf course layouts / site masterplanning 
 Bulk grading of large sites, detailed grading of small areas 
 Cut and Fill 
 Subsurface drainage - easy enough to do "by hand" but would look at automation if available/suitable 
 Need to coordinate with AutoCAD / successfully convert to .dwg 
 
 What I don't do : 
 
 Major Highway work 
 Large scale drainage design 
 Bridges 
 Rail 
 etc. 
 
 Any advice appreciated, thanks.

Mark Marnell · Answer

Do you create your contours 'free-hand' (is that what you mean by an organic shape?), and then make a terrain out of them? So that when you manipulate the contour, the terrain updates. That is possible in OpenSite Designer with the terrain creation tools. 
 Proposed v existing terrain = cut/fill. No problems with this either. Drainage is a module - it is up to you how detailed you design the drainage.