Tonnage limits versus a naval building holiday

Would it be better to remove the naval treaty building holiday or its tonnage limits?

Remove the building holiday and keep the tonnage limits.

The preference is to retain the tonnage limits and remove the building holiday. The tonnage limits are treated as an acceptable shared constraint, while the construction pause leaves everyone trying to extract the most from what is allowed.