I think if you plan on sticking with an 18 ft'ish boat, I too would keep what you have.
Your boat looks sweet, and it'll do anything a new one would!