Brief Answer:
Ultrasound abdomen and echo/ecg

Detailed Answer:
Hello,
Firstly regarding swelling over the sole, I assume there is no redness or pain and swelling is in the leg rather than just sole. You should also observe the other sole and leg for such swelling. The probable cause for such swelling is amlodipine. You are receiving this medication for BP in combination with atenolol. Swelling is side effect of this medication. If its mild and not troubling then you may continue with current amlodipine, otherwise you need to change it to other salt like cilinidipine, dose depending upon the amlodipine dose. However, considering your risk factors of diabetes and high BP, it's better if we ruled out some other causes well especially cardiac causes. So it's better if you go Ecg, echo if not done recently. Also, renal function test should be done if not had recently. You should keep your leg elevated using pillow during sleeping.
If there is pain, redness along with swelling then better to get examined by local doctor.
Now regarding abdominal heaviness, you mentioned it is occurring right side abdomen and I assume in the upper part. This is usually related to gastritis especially if you have associated symptoms like bloating, burping, heart burns or eructations etc. In that case, you should have antacids like Tab Pan 40 mg before breakfast once daily for five days. However, its recommended to get an ultrasound done to rule out possibility of gall stones especially if its severe or persistent after antacid. You should avoid oily spicy food and avoid heavy meals especially dinner. Have some walk after all meals for 10-15 min atleast.
Hope this helps you and get back if you have any doubts or more information to share.

---