100% agree. Last time around Swinney was up against pre-Iraq New Labour, with the SNP a relatively minor opposition party. Completely different proposition to today.
I think Swinney with Forbes as deputy would go down best with the electorate as a whole, like the previous Salmond/Sturgeon ticket did.