That seems comprehensive, and even in the correct order.
Eurocharged does our tunes, and once you've bought it, they will re-flash,over the internet, anytime you add a change.
I might go for the tune right after the CAI, though.
http://www.eurocharged.com/index.php...d=13&Itemid=99