He shouldn't have waited until the end of the school year.
He Should Have Allowed The Death Eaters To Attack In The Graveyard .
He could have contain his obsession of Magical Heritage and conceal hocrux into normal objects.
He could have ignored the prophecy and continued his activity.
He could have asked a 2nd opinion to check harry In the forest himself