Do not wait for the 1500. Do the big bore. You love your bike, except you wish for a bit more power. Nobody knows what the new bike will look like, how it will handle or ride. And even if it does turn out to be a bike that you do like, you'll have an America that you love but with more CCs.
Soren