I like how the tank looks, that driftwood piece is amazing. Just trim the plants down so you can have the "cave" effect of the driftwood. The bowfront complements the big piece of driftwood and 30g might not since there wont be a bow in it. Honestly I would not waste your time with upgrading to a 30g because after couple of months of having that, you will want an even bigger tank. If your going to upgrade, wait for the $1 per gallon deal at petco and upgrade to a 40g breeder tank. That's the best deal unless you find something on craigslist at a deal.
The worst defeat in the world, is when you give up.