Welcome to HCM
After going through history you are Diabetic and Hypertensive,and wel controlled on insulin
and antihypertensive medicines.
Initially swelling was because of side effect of amlodepin.Now you have developed it again it may be cellulitis
as told by your doctor and this can be treated by medicines and it will improve.
But we should keep the possibilities open like any kidney complication and check for this by renal function test and microalbumin
in the urine.
A cardiac check up and ECG should be done to see any cardiac failure developing, also one should keep a watch on Hemoglobin
level along with Serum Proteins as low proteins can cause swelleing over limbs.
There is no need to change the drugs just take treatment for cellulitis and get a workup /investigation and then it can be treated accordingly.
Good Luck to you.