I'm a little reluctant to suggest an a la carte solution to can lights. For one, you'll probably want to stay on 21w nearly all of the time, which will limit your burn to 2 hours. That's barely adequate even for a typical 2-dive day, and ensures that you'll have to worry about when you turn on your light, remembering to turn it off during your surface swims to and from shore, etc. etc. In short, I doubt it'd be sufficient for you even now. But also, you're going to end up paying much more down the road for something that would cost just a little bit more right now, and going the E/O route adds some real unreliability to the system.
Consider that battery lifetime is affected by how often and how deeply it is discharged. You're nearly guaranteed to run a 4AH battery down to 10% on every dive day. And what if you're on a boat, or a liveaboard where you may dive more than twice a day? You'll need to try to charge it, worry about running on a lower setting or otherwise conserve battery, or end up getting another can sooner rather than later.
Lastly, I'm not a fan of underwater pluggable cords. They add to cost, they're definitely flaky, and they're known to become even moreso over time (the owners manual for some lights suggests pounding them with a rubber mallet when they start causing intermittent lost connections. They're great if you have a specific need for them (switching lightheads underwater, using video lights or undergarment heaters, etc). But will you need one on a 4AH canister? I don't think so. I've done everything I can to deal with mine - using mallets, Sartek-like hose clamps, zipties, electrical tape, and they're never 100% reliable. It makes me nervous stowing my light on a night dive
If a 9AH canister is only $150 more, that's a screaming good value over paying $500 later. That battery pack has plenty of juice for any kind of diving you'll be doing at Monterey, and will probably enjoy a longer life since you'll only discharge it 50% or so on a typical day (and has the stretch to last on those extended dive days too). Plus, you can eliminate the cumbersome E/O cords from the equation, and just buy extra batteries if you need.