1 bitcoin = 1 bitcoin, don't care about ROI, it's just a nice to have byproduct.
The game is not about ROI or fiat value of your stack, it's about increasing your stack.
But yeah the exercise that you did is essential. The way I see it is to 1) diversify your income streams, 2) put all your savings from those streams in Bitcoin, and 3) once you have a big stack, consider selling and diversifying slightly (5% max imo) into biz / real estate in case shit hits the fan.
Meanwhile stay humble, stack stats, and continouly learn about Bitcoin!