I think you got it again, I missed 7...Nd5+ followed by Nb6 in my line

My "I just woke up" mind says that black plays 2... Kb6 and draws, but i may be wrong

In the second diagram, try 2. Nb4 Nc6+ 3. Kc7 and black is in zugzwang, so moving to Ka5, keeping the attacking on the pawn just lets white take with his king, while Kc5 loses to knight takes knight. At least that's what my 11:30 pm mind thinks, so no surprises if that's wrong.