It's not perfect but I think I've gotten to the point where I can't realistically expect any more improvements on my Yi Xuan.
Maybe it's time to just head back to the loathsome Woodpecker mines...