You can try turning off "File" -> "Preferences", tab "Display", setting "Paint Nodes over Edge".
Another possibility is grouping your yellow/orange nodes with an invisible group node. (The BPMN group template from the BPMN palette section works best for this.)