Thanks for the suggestions, the case is something I'm a little picky about and may spend a little more on now then upgrade other parts in a year or two.
The WD blue 500GB and 3600 change seem like an easy swap to make. Think the graphics will likely be RX580 or 1650 suggested.