When I am honest, I lost a bit the overview of the Issue you have.
If you not have the black screen anymore, you might start a new topic and tell us where exactly you get stuck. In the end you already marked a solution.
If I do understand you correctly F42 works when you not try to upgrade, right?
You probably also give us once the information as described here Inxi | the help to help your selves .This way we can exclude some hardware issues you might have.