Don't worry about what 'size' the bike is... if it is comfortable and you don't bag yourself on the top tube then it will work. All the fitting calculations and experts in the world can only get a 'ballpark' fit - it is up to you to experiment with minute adjustments to make yourself comfortable.
If I were you I would experiment with different stem lengths and rises with your current bike until you find one that feels perfect, then when you buy a new bike, have it set up to match the old one.