So it turns out the answer is pretty simple I just needed to delete the database foreign key relationship from my entity model and I could move the FragranceId to the perfume entity.
I then needed to manually remove all reference to the FK from the edmx file's XML to resolve error 3015 and finally re-map the FragranceId to fix error 3004.