The VE table is always increasing with TPS, so fix that
21% TPS and above and 2000rpm and below are needs looking at
Ignition looks safe. Can do with 10degrees at the very low end, below 30% TPS, then smooth into the top ignition, don´t forget that in alpha-n load is not directly proportional to throttle angle so 50% TPS ignition can possibly not be much higher than 100%