You are spot on here. Unfortunately; the influx of Puerto Ricans into Florida will likely swing the state into the D column in 2020.
Florida Legislature needs to go to proportional Electoral Voting for 2020 and beyond. That will deny the Dems nearly half of Florida’s electoral votes. Michigan needs to consider this also because even with a massive swing to Trump in 2016. He only won by 50,000 votes up there and that’s a razor thin margin that’s not likely to be repeated.
Puerto Ricans cant vote in a presidential election? Federal voting rights in Puerto Rico
https://en.wikipedia.org/wiki/Federal_voting_rights_in_Puerto_Rico