Solar with long-term chemical energy storage should play a huge role, but I think it is too soon to say if one will push out the other or if fission will stage a resurgence. A lot depends on incentives to phase out fossil fuels. If natural gas produced electricity remains the cheapest option the development of all energy alternatives will be effected.
If you are arguing that fusion will never compete economically with natural gas, you may be right in the short-term but in that case there may not be a long-term.
