Improve as fast as you can. When you consistently beat your 3.5 friend 6-0, 6-0, then you can slow down the improvement.
Working on skills is great, fun, and continue to do it.
Also, play matches and use the skills under pressure.
I wish I was completely satisfied.