I agree with this.
I think that with Kodija returning he will take a significant portion of focus from the oppo defenders, which in turn will help Davis as you mention. The question is then how do you incorporate them together in a 4-5-1, without sacrificing the midfield. I guess the obvious choice would be onomah, but does that leave us a bit lightweight in the midfield? When we've played 4-4-2 we've always looked a bit flimsy down the middle, Whelan and Jedi cannot play in a midfield pairing.