It seems from your reports that cause for your high BP could be due to kidney disease, which needs to be investigated.
You have to get few investigations done like urine routine, renal function tests,urine protein estimation & if required renal doppler.
As the renal calculi
are not causing any obstruction surgical treatment
may not be required.
The cause for renal dysfunction
if present has to be investigated.
Any ways keep your BP in good control.
Plz consult a nephrologist
for detailed evaluation.