Personally I would go with the second one, I am a bigger fan of AMD now, but I think Ryzen would fit better if you go for AMD, or at least that is what I have been told to.
But I still think it is better to go for a pc instead of a laptop.
This website may be useful for you https://pcpartpicker.com/products/cpu/
Notorious would win, sorry Ommadawn.