Your origional setup is perfect. I have the same case and a 500watt PSU with only 17amps on the 12v rail. Yet it runs ok.
Good choice. Advice: be carful with the tray that you put the MB on and then slide in, it isnt very sturdy and tends to want to crack the securing bolts on the bottom of the case.
Sig removed due to foul language. Please read the rules regarding the allowable content of sigs before reposting your COMPLIANT sig.