OK, what have I gotten myself into?

I'm a newbie when it comes to C&V. I bought an old Gitane. I posted a question about the bottom bracket here before, you may remember, and got some helpful advice. I overhauled the bottom bracket, reinstalled the old cranks and was relatively happy until I noticed that it had a huge wobble.

I thought maybe the chainring was bent, but now I'm thinking I probably just didn't tighten the bolts enough. In any event, I bought a shiny new crankset without thinking at all about which square taper standard I had or needed.

So today I pulled the old crank, put the new one on and, lo and behold, it doesn't even come close to fitting.

Naturally, the next thing I did was to go read Sheldon Brown's article about square taper standards. Surprisingly, it didn't really leave me with a sense of understanding. The new crank doesn't come as close to fitting as Sheldon's article suggests it should.

Here are some pictures.

The spindle:



With the old crank sitting on it:



The top view of the new crank placed on:



That's not going to give me a good chainline.

The front view of the new crank:



You can't really see it well in that last picture, but the crank doesn't go on far enough to put the nut on the end of the spindle, so there's not even a question as to whether this could be forced on with enough tightening (though that seems like a bad idea anyway).

The scant documentation I've been able to find on the new crankset (Origin8 Pro Pulsion) says it needs JIS, but if so then what the heck do I have now? I thought JIS was the bigger one.

So, what do I do about this? Can I get a new spindle that will fit nicely in this bottom bracket? If so, what kind and where can I buy one? Or do I need to just put the old crank back on and wait for Velo Orange's French-threaded bottom brackets to come in?