One more thing that i thought of is that the oir hachaim says regarding chava and the snake that the resin why she fell was that she started going into a conversation with the snake, once she got into a conversation she started entertaining the idea of saying yes even though she went into the conversation t say no. she said no, so he said yes, she said no, he said why not so, she started explaing and by the time the convo had finished she had fallen through. Reb Nachman of breslov brings this idea aswell and says dont challenge your yh or your bad thoughts just leave them and think or do somthing else.
(sorry for rambling on but i had to let it out lol)
Yes, that is a big part of surrender. Acknowledging that the y"h is there but not fighting with it and not dancing with it. If you wrestle with a menuval you will get dirty.