Hi JiP,
These are just my impressions. I find the Edge II to be a phenomenal kite in many areas, but for me, waves aren't one of them, but then again that would depend on the kind of wave riding you are doing. If it is cross off, the Edges will be perfect, if it's cross on, I reckon you will be better off on the Sport II's.
The Edge and the Sport both have the same bottom end but the difference is the Edge creates it's power from flying forward or in other words, apparent wind power. The Sport also relies on a little of the apparent wind power, but no where near as much.
The Sport II is a little heavier (marginally) bar pressure than the Egde II and develops much more grunt straight off the bat like after a hard turn or carve. The way I ride waves I rely on the kite to turn quickly and develop power from a standing start at times and this lends itself much better to the Sport.
To be fair I haven't ridden the 9m Edge II in the waves so can't really make a comment on it's individual performance, but with my experience, Lower aspect ratio kites work better in the surf, especially in the larger sizes as they are used in lighter winds when "down the line" riding is more critical.
We are also getting in some 7m Edge II's, they will go well in the winter squalls for wave riding.
The rest of the quiver you mentioned looks right on!
Again, to be sure, give us a call and have a demo ride before you buy. I'd much rather you bought the kite that fits your style to a "T" rather than you having to adapt your style to match the kite.
Good winds,