Have a look at DUI.
They have both.
I dive with a DUI, crushed neoprene, soft feet/neoprene neck and wrist seals, fully optioned, Signature Series. My suit has cargo pockets/knife sheath/large Kevlar knee protectors.
Front dry zipper, with dry zipper enclosure, built in suspenders
Rugged/durable, nice and warm, with light undergarments. No buoyancy issues. I wear a two piece T-Max Heat, fleece under-garment and T-Max Heat socks. Winter diving, North Pacific, off BC coast, nice and warm!
Mine was custom tailored for me so it fits properly, (telescoping waist with crotch strap), no overbulk or wrinkles/creases to trap air.
I prefer soft feet. The suit can be completely turned inside out, easy/quick drying/easy inspection/easy maintenance.
Not cheap, but properly cared for, it's a long term investment.
Over the soft feet I wear DUI Rock Boots, OMS Slipstream fins.
Hope this helps,
Regards,
Rose