I'd back Daniel on the 'run more' front.
But f**k, what do I know? I can't run for shit anyway.
Seriously though, I made a vague hint about this the other day. Some specificity is necessary. Tabatas and sprints get you fit, but across how many levels? Don't be that be that moonhead over at dragondoor who prepared for a marathon by...just lifting kettlebells. In respect for him it was an experiment but if I suggested swimming the English Channel on a regimen of spinning you'd laugh at me.
As for an internet search, 1500m might be a better bet as it is the competitive distance.