Change the atlatl into a launcher that throws spears. This means that Xiuhcoatl is no longer a weapon in its own right. Re-buff it by making it give fire damage to all spears thrown from it, and also reduce the weight by half of all spears in main inventory, or make them weigh 10 like daggers.