With party on brink of Westminster revival under Ruth Davidson, the main political dynamic in Scotland is now SNP v Tories