7k is the limit for a maxi ISA but if you want to stick to cash then yea, I'd do what you said. Mini cash ISA now and another after April 6th.

Personally I'd go with a maxi ISA with 3k in cash and the rest in a sensible stock and shares fund.