Thanks, DOS.
I came back to answer some of my own questions....
I took the whole thing apart, and found what we figured was going on... Power Spline, with flange on drive-side:
For a compact crank, 1,040 grams (including BB) seems like something worthy of an upgrade when the time comes.
I already have 4,000+ miles on this... maybe I can convince myself the time has already come.
I installed a GXP BB crankset I have lying around. Chainline is perfect. The pedals sit inboard a little more than my current setup, but that is not a problem. I guess I'll be on the lookout for a compact-crank GXP set. Hmmm.... I could also go for the Octalink, as you mentioned, too.