My approach to marksmanship was also to start at 7 yards and gradually work back to longer distances. The philosophy behind being able to shoot accurately at distance making short ranges easier works well for some. And while I shoot 80% of the time now at 25 yards, personally I found it easier to work on different mechanics (sight alignment, trigger control, grip, stance, *flinch*, sight picture, breathing, follow-up) when you could see where the shot was hitting each time.
You might try 5 shots for grouping until you're satisfied with the results then move back to 10 yards, 15 yards, and finally 25 yards. Eventually you can try shooting 10 shot strings because it offers a greater challenge at any distance.
I'm probably a bit extreme, but I saved my targets from each range session when I was starting out to compare from outing to outing. It helped me spot bad tendencies and weaknesses so I could isolate them. I'd work on changing one thing each time to see the results.
Keep up the good work. You're doing fine.