PS5 is a better choice from another angle. If you also want to play via steam deck, PS5 remote play works great via chiaki4deck. This is the way I am going to play most of the time
I’ve actually given up on replacing batteries now. Got those replacement battery kits + charging stand which is much more convenient.
https://www.jbhifi.com.au/products/powera-dual-charging-station-for-xbox-series-x