Returning player need some advice

So I recently returned about 4-5 days ago and am currently p580 or so but my gear isn't the best, I have very few ancient items on my wizard or monk and wondering what the best way to go is.

1. Spam the highest rift/gr I can do in 2-3 minutes for forgotten souls and re-roll my items for ancient.
2. Try and gear my monk for support (a couple of my inna's pieces are ancient already) (Also should i use Diamonds or Amethyst in the armor/legs?)
3. Another idea I haven't thought of?

I can just about get my gems leveled up to lvl 60 (roughly 45 on my own then last 15 levels being a scumbag and leeching from pugs or friends groups when they have spare room for me) Should I augment the few Ancient pieces I already have with lvl 60 gems or should I wait until I have much stronger gear and can level them up to 80-100+??