Government should scrap new City watchdog, says think-tank