Hi,
I would in general increase volume first, then intensity since ME will be probably the limiting factor here. So try to reach 30min with 2 sets and then transition to only one set. Your ME performance will be probably limiting you first.
Cheers
Dada