Those aren't going to change. They are the ultimate measures of golf at the highest level, just as the Olympics are that measure for swimmers. At best, golf in the Olympics would be on the level of the President's Cup, an unfortunate attempt to capitalize on the Ryder Cup's unique passion and history. In reality, it's not a big deal. The Olympics should be something so special athletes spend their lives dreaming about it.
Golf already has that.
It's called the Masters.