Watchdog wants tougher regulation of heating oil market