The Historical Museum has some Viking material on display. It's a good option until the Viking Ship Museum reopens.
I also liked the National Museum and MUNCH. Both are quite new. I went to the National Museum primarily for the art, but it also shows decorative art and a fashion collection.
The Astrup Fearnley Museum is good for those who like modern art. The Henie Onsted Kunstsenter also has a good modern-art collection. It's outside Oslo but accessible via bus and a short walk.
I haven't been to the Maloy Raid Center, so I can't comment on how much that might be duplicated by the Norway Resistance Museum. The latter is a bit of a walk from the nearest public-transit access point, as I recall, so a visit there might take more time than expected.
Oslo has a lot more museums. A bit of Googling might turn up something aligned with your personal interests.