Thanks for your comments, everyone.
End result: Increase the Avalon hash rate, decrease the Avalon price, and swap the Avalon and bASIC power numbers.
Yes, I think that somewhere in transcribing data I swapped bASIC for Avalon. I also didn't know that Avalon was stand-alone, or that it's hashrate would be increased. Since the first two of these are errors on my part I'll update the figures and post an update tonight.
Please keep posting corrections and any updates to device specs - I don't have much time to spend reading relevant threads.