using an internal oscillator, I would define it in Config1h and further in OSCCON?
yes

not forgetting if and when the pll is engaged
and setting define OSC appropriately

there is a tool called meconfig , look it up and download a copy , it makes life easier.
pity is that melabs don't update things much anymore so newer chips are missing , its still useful though