No, just windows.
Other than web browsing, gaming and occasionally watching Football on a second screen while I'm doing something, I won't be using it for any video editing or serious coding etc..
I'm definitely leaning more towards AMD, I've just always been Intel to this point so it feels odd. Definitely think I'm going to see what happens with Computex before deciding properly though.
In the meantime, I might buy a new case/fans, screen and PSU etc.. while i figure the rest out. Would also in theory mean I can add to the budget.
I’d leave the PSU unless you plan to use it. No point having kit sat idol burning through warranty waiting for a CPU that might be six months or more away from release.