I think they’re both improvements. Leaving Ghost Shaw in there would be a plot hole, IMO, as unscarred Shaw never existed.
Doesn’t matter. He’s part of the Force and thus can take on any form of his choice.
What if he wanted to come back as a goose?
Then a goose he would be.