Is there any good software to track and compare rides using my own computer
I use IPbike for Android. It has strava upload in case you want it but also gives you files in sensible formats by sensible means. It's got sensor integration but I use it with only GPS. You can give it a good try before you buy. 

The author is no stranger to this site; despite being almost a neighbour of mine according to play store, I've no connection (except for having eventually bought the software)