Tivo Edge DVR + Xfinity Stream Beta App vs. Xfinity XG1v4 DVR

Just a few days ago, I decided to drop my Tivo service and start renting an Xfinity XG1v4 DVR. This was primarily due to Comcast discontinuing support for on-demand on Tivo. Before I made the decision to drop the Tivo, I had heard of the Xfinity Stream App and had tried to get it installed on my Samsung QN49Q6FAM TV (purchased in Feb 2018). That TV is currently running S/W version T-KTMAKUC-1280.5. My first attempt to get the Xfinity Stream App installed was unsuccessful due to the App search function not working on my TV. I assumed that the search failure meant the Xfinity Stream App was not supported on my TV. Just today, I tried again after re-running the Setup for my Samsung TV. All of a sudden the search worked, it found the Xfinity Stream Beta App, and I installed it. It works!

I am now rethinking my decision to drop Tivo. I'm now considering buying a Tivo Edge DVR and returning my Xfinity XG1v4 box back to the Comcast store. My current Tivo DVR (still in my possession but turned-in my Mcard) is a Roamio.

My question is: Should I get On-demand operation through my Samsung TV with functionality as good or better than an Xfinity XG1v4 DVR? For the other activities watching live TV and on-box recordings, I am fairly confident I will like the Tivo Edge user interface better than the Xfinity XG1v4 DVR. This is based on my initial impression of the XG1v4 DVR user interface compared to the Tivo Roamio box I've had for several years. Just looking for some opinions here. Thanks.