You should have an "all of the above" category.
I agree.
You need to practice as much variation as you possibly can, but you need to be realistic about things too.
Practice more up close than at a distance, at least until you start to become more comfortable and proficient. As you get better, then move back until its a challenge, but continue to work on the close range stuff as well.
If your weak in the basics, then practice them (at a distance you can reliably make good hits) until you can shoot without thinking about doing it. You need to have the basics down before you try anything "energetic".
Another thing you need to do is, dryfire and practice presentations constantly, when not at the range. This is just as important as firing live ammo, if not more so. By constantly, I mean everyday.
Understand that what you do on a static "bulls eye" range, is not what youre likely to see when shooting a little more realistically. Dont get all caught up in thinking you need to shoot tiny little groups all the time. Any hit is a good hit, as long as youre not the one taking them. Close enough is good enough, as long as its close enough.
Just realize that if you can keep them in what is generally accepted as a vital zone (on realistic targets), on demand, especially if youre doing so quickly, while drawing, moving, shooting with or without sights, etc, youre doing good.
Having the basics down, and being able to shoot those little groups, on demand as well, makes the above all that much easier, and likely. You do need to understand, that the basics are just that, basics, and dont just get stuck there.