Ya, the limits on both can be turned up to 20,000.
Oh BTW, if you do set up a game using the Proportions warp-point-rich system types, I recommend trying turning off the "all systems connected" setting, because you still get all systems connected, but some interesting configurations.
PvK