Since your solvent and your cocrystallized solvent are the same, you can just choose what you want to do.
When specifying w/w%, writing the exact formulation of your solute is mandatory. If you specify a solution of MgSO4 * 7 H2O and actually use this salt to create your solution, then do not...