4.0 should have both an advanced/vulkan renderer and a lighter GLES renderer.
I do not know of any plans in regards to geometry shaders, but realistically you'd be better off using compute shaders instead of geometry shaders for performance reasons anyways. And down the line may even get access to mesh shaders in the future perhaps.