I really don't think it would be possible to make bitcoin immune to economic conditions and shifts simply because the more Adopted bitcoin becomes , the stronger it's effect on the corresponding economic market.
I don't think so either. But I believe the way bitcoin reacts to different global economic events could change.
Right now whenever there is economic hardship, global tensions, etc. people tend to start buying gold. As it is clear from gold's performance over the past 3 years that global tensions constantly went up.
Why aren't they buying bitcoin as well? This is the question we should ponder. I think people still see bitcoin as being too risky despite its potential to be that actual safe haven. For good reasons too, bitcoin is still volatile with weak hands who panic sell easily. If these two issues are solved, we may start seeing a different reaction.