Yes, the goal should be improving solar, wind, and fission until fusion is ready, which might be two decades from now, or never, but advancing beyond fossil fuels should always be a combined effort in multiple fields. If nothing else, they're frequently quite synergistic.