Since you're asking about code compliance, Code requires that any point along a wall (except narrow spaces between doors) have a receptacle within 6 feet of it. Currently, your "1 outlet per bedroom" situation is grandfathered, meaning it can stay that way as long as you leave it alone.
However, now that you are adding receptacles, you are not allowed to just put them wherever you please. You must place them in compliance with Code, unless it is not feasible to do so. Hypothetically suppose you have all the drywall off except on the one side that is a 14' reinforced concrete wall. It will be impracticable to put a receptacle anywhere along the 14' wall. But you should come as close as you can, e.g. Place receptacles on the adjacent walls with an eye toward covering everything but that unreachable 2' gap.
The fine points of this are something you work out with your AHJ when you pull the permit.
If you're, um, not pulling a permit, then it's vital the work be dead nuts perfect. You are likely to get nailed at sale time. The AHJ's normal response to unpermitted work is to a) condemn the structure conditional on b) pulling a permit to c) demolish the unpermitted work and d) pull another permit to e) redo it. And it's mid-sale, so you must do it all in a rush: the expensive way. So if he finds obvious, avoidable defects, he immediately thinks "How many other defects aren't I seeing?" You want him going "this work is pristine, shame to rip it out, alright fine".
Some jurisdictions have limits on how many lights can be on a circuit. This is a throwback to the golden-glow age of incandescent bulbs, which could overload a large lighting circuit. It is still relevant if you install fixtures capable of taking incandescent bulbs, e.g. with Edison bases, because some people are unaware or unwilling to do efficient lighting, and will fit incandescent bulbs in fixtures where that is possible. Bulbless LED fixtures solve that. It is also why socketed CFLs exist. LEDs don't need sockets because the light emitter proper will outlive you, the fixture, and/or the house.
On panel spaces, as you are already noticing, too-few panel spaces is stifling. You can rectify that with a 20-space-ish subpanel, which is in the $100 ballpark. At that point you'll have plenty.
If you are limiting sockets to stay under some "sockets per circuit" limit, that doesn't help, because the number of sockets has nothing to do with the current draws of what are plugged into it. Having 1 circuit per 2 bedrooms, the occupants of the 2 bedrooms still plug in exactly the same things as if there were 3 circuits per 2 bedrooms.. The only question is whether they get a nuisance breaker trip.