I ran into the keyboard differences with my first Mac too. Went down the same route too. But eventually ripped out the changes.

You can only read so many native Mac instructions that say use Option+somekey only to remember too late that your fiddling has mapped Option to some other key. My advice, start learning the new muscle memory.