Okay, Before the GPU Crisis I found a MSI GTX 1070 Gaming X for 375€.

That would be a good price for a 1070 if you can still find it.

The PSU I could change to a 650W, any recommendations on a good one?

The SeaSonic Focus Plus or EVGA G2/G3 are some of the best PSU's on the market.