Just documenting my progress here for those in a similar situation. I rebooted into flash and fscked the SD card partition, and just hit y to all the prompts. Rebooted into SD, and tried apt-get -f install again. It gave me the pre-installed error again, so I ran my two lines from above, and it gave me one of the file errors. I removed the directory that file was in, ran the two commands above, and ran apt-get -f install AGAIN, and it went off without an error. Checking in About Product still shows the old version number, rebooted and I have the new version number! So, I think I'm all set now...