Cannot upgrade from 6.x-1.5 to 6.x-2.1

I went through the rigamarole to upgrade -- deleted the old notes module, added in the new and ran update.php. Ended with a bunch of failed alter tables.

I Read online to replace Flag Notes first, so I restored my site, deleted and replaced Flag Note -- that did not work, as I got similar fails.

Restored my site and db again, and this time deleted both Flag and Flag Notes, and replaced them both, before running update on both modules at the same time.

Got the following FAILS...

The following queries were executed
flag module
Update #6200
No queries
Update #6201
Failed: ALTER TABLE {flag_content} DROP KEY fid_content_type_content_id_uid
ALTER TABLE {flag_content} ADD UNIQUE KEY fid_content_id_uid (fid, content_id, uid)
ALTER TABLE {flag_counts} ADD INDEX count (count)
Update #6202
ALTER TABLE {flag_content} DROP KEY fid_content_id_uid
Failed: ALTER TABLE {flag_content} DROP INDEX content_type_uid
Failed: ALTER TABLE {flag_content} ADD `sid` INT unsigned NOT NULL DEFAULT 0
Failed: ALTER TABLE {flag_content} ADD UNIQUE KEY fid_content_id_uid_sid (fid, content_id, uid, sid)
Failed: ALTER TABLE {flag_content} ADD INDEX content_type_uid_sid (content_type, uid, sid)
Update #6203
DELETE FROM {flag_counts} WHERE count = 0
Update #6204
ALTER TABLE {flag_counts} DROP PRIMARY KEY
ALTER TABLE {flag_counts} ADD PRIMARY KEY (fid, content_id)
Update #6205
No queries
Update #6206
ALTER TABLE {flag_content} ADD INDEX content_type_content_id_uid_sid (content_type, content_id, uid, sid)
Update #6207
Failed: ALTER TABLE {flag_counts} ADD `last_updated` INT unsigned NOT NULL DEFAULT 0, ADD INDEX last_updated (last_updated)
Update #6208
ALTER TABLE {flag_counts} DROP INDEX count
Failed: ALTER TABLE {flag_counts} DROP INDEX last_updated
Failed: ALTER TABLE {flag_counts} ADD INDEX fid_count (fid, count)
Failed: ALTER TABLE {flag_counts} ADD INDEX fid_last_updated (fid, last_updated)
Update #6209
No queries
Update #6210
Failed: ALTER TABLE {flag_content} ADD INDEX content_id_fid (content_id, fid)

I am at a loss at this point. I also have Flag Page installed. Do I need to also replace this to 2.1 simultaneously, or is this some other problem?

Thanks,
Robert