Former when?? Just for your info: after the Roman Empire collapsed against (mostly) the Visigoths, and after the invasion of the iberian Peninsula by the arabs (711), some Christian Kingdoms took shape. Among them the kingdom of Navarra in 824. Part of the current Vasque country was part of that kingdom. Lately after many turbulences that included attacks from the moors coming from the south, some of the actual provinces of the Vasque Country moved to the Kingdom of Castille, some remained in Navarra.
The kingdom expanded north and south of the Pyrinees, clashing with other kingdoms. Later after many decades of control by the Kingdom of France, Navarra was conquered by the Kingdom of Aragon in the XV century (King Ferdinand conquered it). With the marriage of Ferdinand and Isabella Spain reunites after 8 centuries of muslim invasion. I say reunites because the visigoths ruled previously the whole of Spain for 3 centuries.
Navarra was "annexed" as you say by the kingdom of Aragon. Madrid was not the capital of any place at that time, in fact it was an obscure little village founded probably by the moors. The vasques did not have a separate identity or know identitary issue for a long while, they were just another region of the Kingdom of Spain, which itself was the blending of the Kingdoms of Castille, Aragon, Navarre and Granada.
In fact later in the XIX century the Navarrans and the Vasques were supporting fiercely the "old traditions" of Spain feeding the Carlism movement. However in the end of the XiXs century, together with the romantic movement that was common in Europe, a nationalistic feeling develops in the Vasque country. The dictator Franco contributed to make that feeling bigger in some parts by repressing some customs and the language.
You are sooooo right about that