How do i can change this sentence : A modern physician in a small town not only is proficient in general medicine but surgery as well. To parallel structure?

A modern day physician living in a small town must be a proficient surgeon and he must also be an excellent diagnostician.

Solution: A modern physician in a small town must be proficient in not only general medicine but surgery as well. ("General medicine" and "surgery" are both objects to the preposition "in.")

OR

Solution: A modern physician in a small town must be proficient not only in general medicine but in surgery as well. ("In general medicine" and "in surgery" are both prepositional phrases.)