Yes, if you live in Puerto Rico you do not have an electoral vote. If you are Puerto Rican and live anywhere in the US your vote counts like anyone else.
Thanks to the Jones Act our relationship with Puerto Rico is complicated. They are US citizens (because dear ol WW wanted to draft them as cannon fodder for his endless string of wars) but it is not a state.
I would not be so sure about the Senators being Democrats.
I would prefer to cut them loose but I do not see any way to do that. They are US citizens.
One way or another we need to get off the dime. Continual territory status is not healthy and prone to abuse.
My recommendation is next time Trump is POTUS, appoint AOC as Czarina of PR and spin it off to Venezuela.