Will we be dealing more with non-gravitational forms of potential energy later?

Yes, although gravity will still show up in lots of problems.