We can choose only one answer so in order of preference :
First : Dock split
I prefer a two building system like in Chronicles.
With this system we can put all the units, upgrade and technology in naval building. We can also having individual upgrade for ship like in chronicles.
But if we put this system in place what military ship will be add in the dock in addition of the civilian ship ? A trash unit like in Chronicles.
Problem : lot of rework for the old campaign. This is very unlikely we have this because unlike Chronicles AoE2 not start from scratch but have a already 250 campaign scenarios.
Second : 2 pages dock
If not possible a 2 building system I want a 2 pages dock. With this we overcome the limitation of the iu of the one page dock (overlapping) and we can research all the naval units, upgrade and technology in one building without overlapping.
For researching the naval technology we already must go to another page in the dock. Going to another page in another building (university) is very counterintuitive for me. And keeping the old red arrow to change the page will be continued at least for the building menu of the villagers, so let’s continued this mode for the dock.
With this we can put the unit on the first page and the technology and upgrade on the second page.
On another topic I proposed a two dock page (see image here).
Third : 1 page dock
One page as proposed is good because we have all the unit in the front page. The problem is overlapping because of the 3x5 tiles of the iu. Maybe with a sixth column ? But the better thing is to merge the upgrade of the military ship and the upgrade of the demolition ship.
Researching naval technology in university ? Why not if we keep access to the demolition ship for all civilization.
Having all the ship in one page : very good thing
The best things of the rework for me. No need to go to the second page when you have already researching all the naval technology.
I support putting all the naval unit on the first (even in the two pages version of the dock)
Not merging the demolition ship upgrade with the other ship upgrade : a bad thing
Demolition ship are always a spoil of resource because in all case you will lost your demolition ship. So keeping an independent cost for the upgrade make demolition ship less appealing now that we will have a counter of the incendiary ship which we will not loose (hulk).
Also merging the upgrade technology of the (galley/incendiary ship/hulk/demolition ship) will resolve the problem of overlapping.
I support this merging in all cases (2 pages dock, 1 page dock or dock splitted in two buildings).