Replacing Siding including 2″ Foam and Rainscreen

We are currently starting the process of replacing the vinyl siding on my house, which our family owned company installed 10 years ago, before I was involved in the business. We are replacing the siding with LP Smartside lap siding.
The plan is to cover the current Tyvek with Tyvek Drainwrap, 2″ of EPS foam, 3/4″ furring strips as a rain screen, and then the siding. We will be using Cor A Vent SV-5 siding ventilation.
Our home was poorly insulated with fiberglass batt insulation within the 2×6 stud cavities when it was first constructed, hence the additional 2″ foam.
When we removed the existing siding, I discovered that the Andersen windows were installed without any flashing details, with the Tyvek wrapped into the window opening, and the window installed on the outside. I am planning to just install the new drainwrap over the existing Tyvek, with a header flashing detail and Tyvek straightflash on the sides.
I have used a research paper by Peter Baker for much of the planning for this project:
http://www.buildingscience.com/documents/reports/rr-1204-external-insulation-masonry-walls-wood-framed-walls/view?topic=resources/retrofits
Any thoughts on this?
Chris Rautmann
Replies
This is near Milwaukee, Wisconsin, climate zone 6.
The windows have nailing flanges.
The windows will remain as installed, with external extension jambs applied of the LP Smartside trim material.