I personally feel like these things are equally crucial. I agree with the notion that the reason behind the emphasis on Spirit Baptism is and was inspired by the imminent coming of Christ and the need for spreading the Gospel, and therefore, these things are interrelated and equally important when talking about distinctives. If we remove one or the other, we do not see the full picture of what it means to be Pentecostal, and so I believe their "weight" if you will, to be interchangeable.
I do think that Pentecostals should allow for eschatological diversity among its clergy and congregants. Part of what is so beautiful about Pentecostalism is the freedom found within it. We understand the importance of testimony, of metaphor, of spontaneity, and within these things, we find diversity. It is not Christlike to turn someone away just because they have different theology, or are even still figuring out exactly what they believe. That being said, I do think that the denomination as a whole should continue to endorse a pre-tribulational position officially, and should continue to guide and teach in that same vein. In a nutshell, I don't think we should kick anyone out of the church, but I do think that we should steer them in the right direction.