Agreed.
Any change in the definition of a bitcoin would be suicide.
Repeat after me: There will never be more than 21 million Bitcoins. Ever.
Think about it: 21 million Bitcoins for a global currency?
I might be repeating myself ... but: That might work for the currency of a little city - but for a global scale, it will be by far too little. Ok, they can be divided - but only geeks will work with 0.00001 Bitcoin amounts. Again: That'll work just fine for a niche currency (the currency that only mathematicians use) - but it won't work when Bitcoin scales up to where it will be really disruptive.
So I'd say: Let's switch it over as soon as possible. Let's do it in a way that doesn't scare people away (see link to other thread posted above - by doing it with a couple of steps over a longer period of time it should be easy enough; and that is "as soon as possible" - sooner would in fact very likely be a problem).
Then, we'll have 21 trillion Bitcoins. Sounds much more reasonable to me. That 21 million thing really is a bug (see a few pages above ;-) ).
Let's fix it :-)