There are people who are very much against what I am about to suggest:

It is known by prop-freaks (such as myself) that Luke used at least four separate lightsaber props, plus the one that was shot out of R2-D2. The prop in the "I see that you have constructed a new lightsaber" scene is commonly known as the "Hero". A variation of this (modified after filming) is what has been replicated and sold by Master Replicas.

I suggest that the other lightsaber props be edited to look more like the "hero", wherever possible. One of the props on the sail barge (known in prop-circles as the "Yuma saber") is very much like the "hero saber", but it lacks a circuit board and some of the gold paint has rubbed off. The one on the Emperor's chair has a knob that is not present on any of the others.