If waiting for Book Seven is causing you fits (or even if it's not) allow me to recommend
HP Widdershins, Dido's wonderful (and beautifully illustrated) version of how it could all work out if only Harry, Hermione, and Dudley used Harry's money and some common sense. Yes I said Dudley. Just trust me.