Dear conn users and Dear Alfonso

I have a question about my design setup.

I have 2 groups (individuals who underwent different interventions, Ma and Mb), and each group underwent cognitive tasks before and after the intervention. Two resting-state fMRI was acquired after cognitive tasks.

So, my study design comprises of 5 conditions (baseline resting-state, cognitive task2 [C1], resting-state[P1], intervention[M], cognitive task2 [C2], resting-state[P2]).

I want to test the hypothesis that different interventions (Ma vs. Mb) may differently alter functional connectivity during cognitive tasks (C1 vs. C2) and resting-state FC after cognitive tasks (P1 vs. P2). 

For this, I did two 2x2 ANOVA anaylses.

ANOVA1: interaction between groups (Ma and Mb) and conditions (resting state after cognitive tasks, P1 and P2)
Between-subject contrast: [-1 1]
Between-condition contrast: [-1 1]

ANOVA2: interaction between groups (Ma and Mb) and conditions (during cognitive tasks, C1 and C2)
Between-subject contrast: [-1 1]
Between-condition contrast: [-1 1]

My first question is whether I should include baseline resting-state in between-condition contrast and how to include.

In my opinion, I would be able to include baseline condition by addressing baseline condition as a covariate as;
Between-condition contrast (B, P1, P2): [0 -1 1]
or, subtracting baseline condition from other condition conditions as;
Between-condition contrast (P1-B, P2-B): [-1 1]

Suppose I would be better to include the baseline condition, which of the two ways is more appropriate. Or is there any other better way?

Additionally, I also ask how to make a second analysis, "Between-condition contrast (P1-B, P2-B): [-1 1]". 

Best
Jun