You don't define "pre-hypertension" and it merits noting that mildly elevated blood pressures are almost never associated with passing out. As you note - you should not drink any alcohol, should avoid salt, should lose weight and exercise regularly.
When blood pressure shows sudden rises it is often a good idea to check kidneys and their function.
If you have recurrence of the palpitations it would be a good idea to determine the cause (24 or 48-hour electrocardiographic monitoring, so-called Holter monitoring, might help).
You should continue to check your blood pressures. You are right that the pressures are still too high, and your doctor will want to adjust the medication dosage or add medication. Drugs like amlodipine act rather quickly. It often requires two medications to control blood pressure.
Please be aware that I am unable to diagnose medical conditions online.