Yes that seems fine for what you have now. But what's you plan for the future? If you are going to add a power adder, you would have to upgrade again.
Maybe that's not in the stars or maybe its far enough down the road to put off the other requisite upgrades.
Bottom line: the fuel set-up you mentioned would be fine for what you have
now. 