I'd switch Order of the Phoenix and Half-Blood Prince if only for their treatment of supporting characters. OOP introduced fantastic characters in Luna and Tonks and finally gave Bonnie Wright the badass but compassionate Ginny Weasley from the novels.