Here is another possible option (for prebuilts anyway) put a 6 watt 8 ohm resistor in series with the positive lead to knock down the peak current
8-Ohm Non-Inductive Resistor - RadioShack.com
Though I think an external 6-8 volt regulator would be much more effective for the same price.