So maybe the first option is best. Let me make sure I have the process right: Change all the non-core plugin IDs (I count 21 of them)to something over 500, i.e. change 17 to 517, then change the foreign key plugin IDs in the _comprofier_fields and _comprofiler_tabs tables to match, then set the auto increment value in _comprofiler_plugin to 540 (it's at 40 now, I assume my last ID will be 539).
That's probably easier than restoring my old backup so I can remove the gallery then having to do it all over again when the next release comes out.