Green/Black
I hate to open this can of worms, but I just did the upgrade. Since the stock speakers were labeled, and green went to +, black - (like its supposed to be), I came back here to be doubly sure... No disrespect to the first post, which is HUGELY helpful, but I had to check this out since the stock stuff was so nicely labeled.
Well I plugged it in both ways, and the Green + way sounded more in phase. Just t o be doubly sure, I plugged in my trusty volt meter, and ran it both ways, the green + peaked at the right times, and was very consistent, the Black + way was all wrong, as far as the volt meter was showing me, it valleyed off during intensive bass (it helps to listen to techno), and peaked at strange times, and quite simply fell off the meter at strange times.
So.... given that its labeled that way, it's convention that, way, it sounded better to me, and that the voltmeter seems to point me in that direction, I have it green +, black -.
I could be WAY wrong, I am no elec engineer by any means, and no disrespect intended, I know it takes a boatload of work to do a walk through like you did, so thanks so much!