I voted for... and have... #2.
And extension tubes I've used with both (Kenko and Canon).... As well as with other lenses.
On a crop sensor cameras I think the 50mm and 100mm Macro would make for a more versatile combination. The 50mm is more ideal for portaits than the 60/2.8. For one, f1.4 is two full stops faster.
I haven't used the 100/2 personally. Don't feel the need for it since I have the 100/2.8 Macro, which is a good, dual purpose lens thanks to adequately fast auto focus. Keep to 1/125, 1/160 shutter speed and the 100/2.8 is eminently hand holdable. Also, it can be fitted with a tripod ring, which of course makes it very usable on a monopod or tripod.
Yes, the new 100/2.8L Macro looks very interersting. I'm not going to be running out to buy one immediately, it's hard to imagine the image quality being all that much better than the current lens... and I don't particularly need IS on this focal length or the way I use a macro lens. However, Canon's MTF charts seem to show we might expect fantastic IQ from the new lens. Is it worth more than 2X as much? I dunno.
The only lens I've seriously considered instead of the 100/2.8 Macro is the 90mm TS-E. I have and use the 24 and 45mm TS-Es. The latter often serves as my short macro or near-macro lens, usually for table-top product shots.
Also have and use the 180mm Macro. I haven't been using it as much with crop sensor cameras (it's less a dual purpose lens, than the 100/2.8), but added a 5D Mk II full frame to my kit earlier this year... I used it more than the 100mm with my film cameras and imagine the 180 Macro will see more use in the future.