So what is the resolution of these two conflicting descriptions about space?
I think the the issue here is that there isn't really a conflict.
EM is described in three different important (and still used) theories : Maxwell's theory, Special and General Relativity and Quantum Electrodynamics (QED). These models described different contexts and details of electromagnetism. That they have commonality is remarkable, because there's no way Maxwell or Einstein could have foreseen later theories.
Gravity has been modeled using Newton's theories and later general relativistic theories. Many attempts have been made to develop a quantum field-like theory explaining gravity but we have not yet developed such a theory that ticks all the required boxes.
There's no conflict here, they're simply different models of different levels of understanding of physically observed phenomena. They're allowed to be different.
Spacetime isn't considered a medium in modern physics. It was an idea Maxwell had no knowledge of when he developed his brilliant theory. Field theory is typically taught as two different things : classical and quantum. General relativity is, despite the association with modern physics, considered a classical theory - there's no inherent conception of quantum fields in general relativity.
So you're comparing apples with oranges.
They're simply different theories encompassing different levels of understanding.
Is vacuum space a medium of energy propagation or not? It can't be both?
There isn't really a single idea of vacuum/spacetime.
Again this apples and oranges because these theories were all developed under different models of spacetime. Strictly speaking Maxwell worked using a pre-relativistic understanding of what we now call spacetime. It's remarkable indeed that his theoretical model was so good that it "lit the way" for later theorists (including Einstein) to recognize that it required accepting the concept of spacetime as we now understand it to fully "fit" Maxwell's theory into a cogent larger picture.
So we're not comparing like with like and there is no single model of spacetime at work here.
Vacuum is an even more complex concept when you reach quantum field theories. Again, it would be naive to think that these theories share a single model of vacuum.
There's no conflict as I see it, just that you're comparing apples and oranges.