In the meantime, I get around this problem by breaking things up into functions; if that causes problems (sometimes “if valid” nodes are needed), you can always drag off of a node and click “Reroute node” to organize it.
Hopefully this is helpful :),