"Whether or not..." vs. "whether... or not"

Solution 1:

It doesn't matter. Both ways are correct.

Consider the following two examples Pearson Longman cites from The New York Times Manual of Style and Usage:

• I’ll call you tomorrow whether or not I have the answer for you then.

• I’ll call you tomorrow whether I have the answer for you then or not.

If you go to that link and read a little more there, you will also see that in your first sentence, you can even omit the "or not," for example:

• I'm not sure whether I should go.

You can't do that in the second example because "whether" is being used adverbially to modify "charged."