It's absolutely true. Tekton means builder, not carpenter particularly. I think his famous saying about trying to remove the splinter in your brother's eye when you have a plank in your own eye is behind the carpenter theory. Yet, as you rightly point out, he makes a lot more references to masonry work.

Thanks for sharing your insights in a lighthearted but well-informed and entertaining way.