I would do both, but please only do one at a time, as it's so much easier to debug things that way!
Yes, SEX 2.0 iron upgrade is what you want to go for. The instructions will give you secondary wiring instructions, but you'll need to wire for one impedance higher than what you're using. So if you have 8 ohm speakers, wire the OTs for 16 ohms, etc.