Much improved... except for the engineering spaces. As a rule of thumb, you want at least twice as much maintenance life as you have deployment time, because it takes twice as long to rewind maintenance time as deployment time.
You still have a small mismatch in the speed of your ship and the tracking on your fire control.
The rule of thumb I go with for magazine to launcher ratio is roughly equal HS for magazine and launcher, the faster the launcher, the more you should emphasize the magazine. And that is regardless of whether you go with regular launchers, x.5, x.33 or x.25 launchers. That goes for carrier ammo capacities as well, so plan for about 3 reloads for your fighter's box launchers.
For AMM capacity, my theory is that if I outnumber the enemy 2-1, I should be able to destroy them without taking casualties, at least not more than armor damage. Therefore, the defensive fire of two of my ships should be able to neutralize the offensive power of one, or two of my squadrons should be able to handle the fire of one.
And while this isn't a problem with your ship, there is something you want to keep in mind with fuel tanks. You never want a fuel tank hit to mission kill a capital warship. While commercial ships will want the largest and cheapest fuel tanks possible, a military ship that expects to see combat can't afford to watch a million liters of fuel disappear with a single meson hit. For military, front line ships, I recommend either standard 50,000 liter tanks or 250,000 liter tanks, rather than the very large 1,000,000 liter tanks. The cost savings that comes with reduce HtK is not really worth it.
Because space on a military ship is at a premium, if you can have commercial tankers keep up or preposition fuel supplies when you have to move the fleet in a hurry, you will have a somewhat leaner and more efficient war fleet.
But that is something to do if you like micromanaging, if you want fleets that are much simpler to manage, or if you have a particular horror of your warfleet getting stranded without fuel, internal fuel supply is fine.