you can't slip back into old habits if you change the interactions yourself
what is wrong with saying 'hang on - I don't want to do this - this is what we used to do' and changing the subject or just reacting yourself a different way than you usually do
can H drive you can you get someone to look after your D
and yes see if they can arrange it closer
good luck you seem to be doing ok hope everything goes well
