Opportunity

You can have the Edit Tools Addon for free by purchasing the Node Tree Organizer addon.

Edit Tools: edit_tools_link

Node Tree Organizer can organize your geometry or material node tree with one click, or add or remove reroutes.

You can add a reroute to the outputs of the selected node with the "Add Reroute" function with the Shift+Q shortcut.

With the Shift+R shortcut, you can align the selected nodes on the x or y axis with the "Align Nodes" function.

"Organize Node" function with Shift+E shortcut, you can organize only selected nodes.

Update 1.2

+You can easily create a node group with the "Create Group" function with the Shift+F shortcut and  

+Delete reroute to the outputs of the selected node with the "Del Reroute" function with the Shift+V shortcut.

No need to spend hours for organize complex node trees.

Currently only suitable for material or geometry node trees. 

Limitations:

There must be at least 1 "Group Output" or "Material Output" Node.

Contact me in case of any bugs. I will fix it in 3-4 business days.

safasstm.st@gmail.com