It seems hard to separate fact from fiction when researching.
hi! not discouraging more information, but FYI, there have been a few posts on both subjects, so you can get started on these:
Any evidence of the origin of the black stone in the Ka'ba in Mecca?
Who really built the Kaaba in Mecca
Do we know who built the Kabba in Mecca?
Is there any evidence to the idea that Muhammad established the Hajj as a Pillar of Islam in order to gain support from the powerful merchants that 'ran' the city?
The 'Black Stone' that sits in the Kaaba in Mecca: is it the same stone that was put there by Mohammed? Or was it replaced at some point in history?