I knew something was off the moment he showed up in his old outfit (and if you think about it, the blue saber) but I was confused the entire time on my first viewing until the lightsaber. I thought it was great.
Speaking of his old outfit, I’m sure Luke might have kept it in his hut. I mean, we don’t really know what actually happened to it.