Stay in SD, leave the fuel trims enabled, use those to tune under 4000rpm, log, apply to VE table, smooth and repeat, until your trims are within 5% of 0, you are likely creating headaches by switching back and fourth. Your VE still needs work, use the trims and give it what it wants. Reset the LTFTs with VCM scanner before each new log.