Part 2 Mini-Boss list predictions

[Mercen-X]

The following are random encounters in the OG which I believe will become one-time boss numbers in Part 2's chapter progression based on the patterned precedent set by the Remake. Obviously, any boss fight that exists in the OG will be replicated in Part 2 and doesn't need to be listed here. Obviously pre-existing Mini-Bosses don't need to be listed either (i.e. Gorki, Shake, Chekhov, and Staniv, etc.)
Also bear in mind these predictions will likely be mostly Sidequests. I also wager the sequel to have more Underwater combat and a Boss for the Submarine Minigame (akin to how they handled M.O.T.O.R.) Most likely, Emerald Weapon would be "fought" using the sub's torpedoes.

MiniBoss/SubBoss:
Hellish Rider (Midgar Area, possibly a G-Bike boss)
Zolom (Midgar Marsh/Mythril Mines)
Madrogue (Mythril Mines: win or steal Grand Glove)
Shinra Commander (Ft Condor minigame)
Unkamen Ninja & Wutai Bandits (Junon Area, "sidequest")
Grand Galan (Costa Del Sol, maybe)
Cockatrice (Mt. Corel)
Bagnadrana (maybe)
Triceratank (Battle Arena)
Bullmotor (Corel Prison)
Chimeric Mantis (Gongaga)
Arid Golem (Cosmo Canyon)
Griffon (Cosmo Canyon)
Valron (Nibel Area)
Gyrotine (Shinra Manor)
Yin & Yang (Shinra Basement)
Black Cauldron (bats)
Adamantoise (Wutai Beach)
Garuda (DaChao)
Dual Horn (outside TotA)
Tornado (outside TotA)
Octulus (TotA)
Gemini (TotA)
Doorbull (TotA)
Antrodemus (Bone Village)
Gluttony (Coral Valley)
Acrophis (Coral Valley Exit)
Snow (Glacier)
Magnagard (Glacier)
Stilva (Gaia's Cliff)
Malboro (Gaia's Cliff)
Coeurl (Gaia's Cliff)
Gigantes (Whirlwind Maze)
Dragon Rider (Whirlwind Maze)
Hippogriff (Mideel Area)
Sea Worm (Mideel Beach)
Ghost Ship (Seafloor Reactor)
Guardian (Seafloor Reactor)
Three Unknown (Sunken Guernica)

Great Crater bosses (nearly everything):
Pollensalta
Darkfire Drake
Master Tonberry
Death Dealer
Ahriman
Armored Golem
Behemoth King
Wolfram
Scissors
Necromanced Drake

Again, these are my personal predictions going off a pattern I've seen. I DON'T CLAIM ANY INSIDER INFO.

Also, I changed some names because 1) more than a few enemy names in Remake were changed and 2) I felt like it.

Seem likely? Did I miss anything? Some other mini-game or sidequests?

OP's Note: Italics represent names I mutilated for my own entertainment. Bolded names represented randoms I'm certain will become bosses. Great Crater is bolded because I'm sure that every name in that section will be a boss/mini-boss.