There has been a lot of talk about this problem lately, and I continue to recommend everyone to read this topic: The RNG Problem, Enchantment System Vs Gem System (Refined)
Even though I wrote it before the rerolls were limited, It still works very well as a solution to the RNG problem.
The only thing I would like to specify is that even if the topic demonstrates that the gem system can completely replace the enchantment system, I think it would be a good idea to have both.
So as to maintain the roguelike aspect of the enchantments but at the same time have the security of the “advanced” gem system that I proposed in the topic.