Does anybody else feel that the Feitoria should be redesigned or replaced?

TL;DR: Building whom's only function is as an boring inevitable "I win" button in 1v1 games that last longer than 60 minutes, whilst being near completely irrelevant in Team Games and all other situations in 1v1 matches. Should be redesigned so that Portuguese have an more interesting playstyle, and have an more balanced winrate overall on land maps.

It only ever functions as an wonder-esq win condition in 1v1 Post-Imp games were resources have run out (Games usually end before this results on land maps, but it is an very consistent reality even at the high level on water maps, were resources are overall more scarce and Wood is incredibly valuable), whilst being near completely useless in Team Games and all other stages in the game in 1v1 matches. Compared to other unique buildings like the Bulgarians' Krepost or Sicillians Donjon, the Feitoria adds effectively very little in most matches outside of the previously mentioned use case.

Additionally it also seems to be the primary reason why Portuguese stay painfully mediocre at all other stages in the game on land, as they are required to remain as such in order to prevent the Civ from becoming overpowered, as Portuguese theoretically have the best late-game out of all Civs (Gold Units are always overall better than Trash Units) due to the Feitoria.

In terms of what the Feitoria could function as instead I'm not entirely sure, maybe as an more economically focused version of the Castle that's functions defensively as an middle ground between the Krepost and the Town Center, that's able to create its own villagers and function as an resource drop off point? Aslong as it's more dynamic and interesting at all points in the game, than it's current version I don't personally mind.

The original Feitoria could always still remain in the Map Editor for Scenario/Map designers to use (Feitora Nothing Map when btw), and to prevent pre-existing scenarios that feature it from being broken.

Evidence for my points for those who are interested:

https://aoestats.io/civ/Portuguese/RM_1v1/1650+ (Notice how their winrate is sub 47.5%, until it spikes up exponentially post 30-40 minutes at all ELO ranges)

https://youtu.be/XwvjS5OrJSw?t=2191 (Portuguese vs Vietnamese HC4 Finals match on Islands, were Feitorias eventually decide the game. There are also numerous other replays of high level games on water maps with Portuguese, that end in an similar manner)