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.
Exactly. He’s in the form Luke would recognize him in.