You've got a working fix! Congratulations!
Justin,
This would have been a tough bug to crack. Hats of to you Justin! Now don't touch anything and burn a CD-ROM of your website code as-is. You don't want to snatch defeat from the jaws of victory.
Gary