keep it simple.
When you heave-to, use the jib. It's so easy then. let the boat, fullkeel or finkeel, settle down, and the rest is like driving in a parking lot, slow and simple.
If you do not use the jib, what what. it works so well with a jib and is such a crapshoot without one.
Practice. That is what works best with heave-to's, practice. do them when you don't really need them and get good at them. Then in that moment when you are all frantic, you'll look like a pro.