Outside of erasing him as is and then redoing the whole thing as an actual baby born in the present day, there is no fix. Any method of retconning his existence into the past of the general post-Crisis continuity where he never existed will never be clean. So either of the OP's options have the same amount of effect, which is essentially none at all. Those would produce the same amount of lack of sense as the current status quo does.