Right:
rpm -q fedora-release says I've got fedora-release-1-3. How do I update that?
That's a fedora-release package from FC1. If you still have that then your upgrade process is badly broken. It should have been upgraded along with all the other packages. There should be a fedora-release version 3 package in your install media or base repo.
Paul.