You should do a bit of both, as they are stressing you in different ways. Personally I always emphasised spinning over mashing. The real key is to rest enough between intervals so that the intensity and duration of the effort can be as high as possible.
Do you have any opportunities to MotorPace?