You could work with the Deathly Hallows subplot, you'd just need to plant it a lot sooner. Not have it come out of nowhere. (And I freely admit I'm working off of second-hand information. Thus the planned re-read of canon.)

Still need to download that! I tried reading it on the journals, and got very lost. And Lust Over Pendle I only know from mentions on fandom_wank, because Harry Potter fandom. :resigned sigh: