Sorry, Jeff, but I would replace the 804N first! Unless your room somehow makes 'em work well, I found their spectral tilt to be just too weird. The 803N is far better balanced, although it requires a large room to cohere well.
You could probably fair-trade 'em for something with a more natural midrange like the Revel Performa F30 and be satisfied with your Genki. THEN ugrade that later.
Just my skewed opinion....
