Wouldn't going from Hawai'i -> Canada/Mexico -> US solve this?
Similarly for Puerto Rico, wouldn't Florida -> The Bahamas -> Puerto Rico solve some of the issues?
The only issue with adding foreign stops is the additional import/export regulations. NAFTA solves some of that for an intermediary stop in Canada/Mexico, but doesn't do much to help Puerto Rico's situation.
As stated, statehood would not solve this part of the problem for Puerto Rico (i.e., they would need a Jones Act exemption as well).