Got it. Thanks for the help everyone!
I haven't used any of the new addresses so overwriting the new wallet.dat file should be okay.
Here are my computer's specs: Processor 3.5 GHz Intel Core i7
Memory 32 GB 1600 MHz DDR3
Graphics NVIDIA GeForce GTX 780M 4096 MB
Software OS X 10.9.4
I'm sure it's powerful enough to rebuild the database in no time, or at least I hope.
Thanks again guys! I'll leave some positive feed back to y'all as a thank you.