I think ur right on both counts.  It looks like what you have now is good.