Your info is good. FYI the non-Arab or Pakistan spelling is Pahlavi not Pahlevi. Yes, nitpicking but not in a mean way.
You are of course right. Actually I always write Pahlavi, but I am currently reading an old german book on Reza Shah, and they call him (germanized) "Resa Schah Pahlewi" and so the e stuck in my mind.