I guess I could move the router to the 2nd floor but have a feeling its time to move up.
Both.
Unless you're going to a multi-router mesh setup, any single router you end up purchasing would likely give you better overall performance in the 2nd floor location, if it's logistically (or economically) feasible to do so.