Thinking of shaking up my portfolio, thoughts? 20M - Long Term