I wouldn't be so quick to decide whether the bike is too small for the OP. I like to see more seatpost as well but there are a lot of variables that go into bike fitting. Plus a lot of pros won races without much more seatpost showing than what the OP has showing.

Agree that upgrading makes little sense. A 2d set of wheels might make sense depending on the OP's use of the bike (e.g., one set for commuting and general riding, and another for racing or riding hard).