Pretty much yes. The war on terror consuming much of Bush's doctrine had two main planks. The elimination of terrorist groups via military action and the growth of democracy in the region. The Bush administration believed terrorism grew in states which were overly authoritarian due to the lack of political space and also the tendency of authoritarianism actually to be quite poor governors of states themselves. This is pretty correct, and if you read the academic literature on terrorism, they're not that far wrong. Authoritarianism breeds poor resilience for states to act, lowering capacity to deal with problems when they emerge due to poor decision-making, cronyism, and using the military as a police force.
The second plank was using military action to stop terrorism. This involved measures with dubious legality such as extraordinary rendition but also using a doctrine called 'pre-emptive self defence'. This was the belief that rather than waiting for someone to attack you, who you know is going to attack you, you attack them first. This is much more controversial and led to the mistaken belief Iraq had WMD. Of course, this doctrine also plays into the fact that authoritarians oftentimes try to look stronger than they really are. However, even though the Iraq invasion was handled terribly, by 2008, post-surge, the country actually had relative stability until the collapse of Syria and the rise of IS which continues to have a lasting effect.
The freedom agenda was incomplete precisely because the US tried to work with authoritarian regimes in the region undermining their moral credibility in pursuing more democractic governments. That and the morally dubious, extra legal methods used to address terrorist organisations further hindered their ability to pursue meaningful change. However, if the US had gone in harder, such as tackling Syria, along with Iraq, cleaning up the fascist Ba'ath states once and for all, this would, in my opinion, have made life much easier for the US in Iraq and made the region a much better place. The Arab Springs which brought about the possibility of widespread change would have had more of a chance of success if Bush had established a clearer and better track record of delivering democracy to the region.