So....there are loads of things in the wizarding world that could put an end to some problems:actually not all of them make sense so if u bother reading this please feel free to contradict me by giving me an explanation on the topic..
1. Could harry just consume Felix Felicis before fighting voldemort or during other situations
2. the time turner- there r way more other situations I could think of using a time turner like during the battle(Don't try this at home!!! Don't meddle with time)
Pls let me know if u can think of more