I broke it again when I was installing bbPress. Turned out there was a conflict between the OptimizePress theme and bbPress. Long story short. I installed a different plugin and I now have the forums working. I re-ran force-upgrade.php yesterday and my login is working again. I think I can finally put this one to bed. Yeah!!!