The heaters in Canada were about 550 a piece, if it's under warranty then you should take advantage of that as much as possible.
The cleaning will help if it's obstructing air flow, which should fix the issue for, im guessing a year or two, till you need to go in and do it again. Some shops...