I used both, depending on the pony's hair state. I mostly just use a conditioner, but for horrible matting I use fabric softener. I had a G3 Styling Rainbow Dash whose mane was just one big matte. It worked wonders for detangling her mane, but I wouldn't say it left is silky, just brushable.
Good luck on your journey!