APUSH Essay Thesis Help?

For my AP US History class we have to get the hang of DBQs for future testing:
The question on my current dbq is:
Analyze the responses of Franklin D. Roosevelt’s administration to the problems of the Great Depression. (q1?) How effective were these responses? (q2?) How did they change the role of the federal government? </p>

The thing is that there seems to be TWO questions? I need to make a neat, three-pronged thesis with three reasons why my thesis statement is correct but there are two statements (one referring to the effectiveness of the policies and one to the role of federal government)</p>

This resulted in my thesis being:
The administration increased the role of federal government but failed to resolve the economic woes of the Great Depression. This is evidenced by (1.) unrest among the workforce, (2.) soaring unemployment, and (3.) the creation of the Securities and Exchange Commission and Social Security Administration. </p>

This leaves prong 1 & prong 2 referring to the economic crisis (question 1: effectiveness) and prong 3 along addressing the governmental changes (question 2: role of federal govt.). </p>

I thought my thesis should be one solid point with three “prongs” of summarized evidence. Instead my thesis makes two separate points and 2 reasons address the first while one addresses the second. </p>

Is this acceptable? If not how can I make my thesis one point with 3 relevant pieces of evidence without neglecting the other question completely?</p>

I’m a bit lost when it comes to AP work! Any advice from those of you who have experience with this kind of writing would be appreciated</p>