not end of 2025 but almost got it right 
You had a good calculation, and there's still a long time until the end of the year and as things stand, 7 BTC + 70 ETH will very likely be much more than $1 million. The question is what happens when you reach that goal - because if you sell, you have fiat that loses value every day just by keeping it, so it would be best to invest in something again.
Anyway, those seem like sweet worries to me - because a million $ can make most people happy, no matter where they live
