I like the old one more but for consistency this is great. Excellent work.
Anyway, I was thinking a simple to fix Barty Crouch Jr.'s stupidly convoluted plan would be to make it look like he’s trying to kill Harry in the tasks. For example, the dragon is trained not to breathe fire, but Barty makes it do so anyways. He pays the Merfolk to attack Harry. The portkey trophy is an eleventh hour scenario he came up with when all else failed. All this doubles as a way of making a regularly occurring competition for teenagers seem less irresponsibly deadly.