I think fire leash is a good deal! dont need change to magma storm. and about heat wave to close combat, will lost 1 more area atack to hunt. i dont think is difficult to hit, because actualy i can clean 1 wave on ice 200 using just arcanine without change poke.
actualy i think arcanine is great