Again any reasonable person understands that “k” is yes. You can certainly make arrangements for both of you to satisfy your commitments. Being a man of word is very attractive to women so simply apologize for the miscommunication and move forward.
Your bigger problem is your GF is manipulative and you never addressed your issues from your first marriage. This IMO needs to be addressed ASAP.