I am not sure, maybe I have been going in too much detail here, I do not really get into full remap guides as there are plenty resources already online. So maybe I will just stick to my findings and final results. Great forum with lot of info where I got my first knowledge was
https://www.ecuconnections.com/forum/, I am attaching a guide for EDC16 from that forum as well if anyone is interested in going into details