Add and configure origami, and enable it for majro modes where it seems to do a good job, and keep using hideshow for other major modes.