I would leave the offense skill positions alone.
We really need defense. Considering our cap situation....we might not have the money to do both. I would start with the defense first.