[rjblackman]

it might be worth trying oh-my-pi in your case as it claims to improve the edit calls by using a unique patching format.