Yes, all of the above given tips.
Try to get a Spine Bow with atleast 1k edps - get 1x Inspired Learning atleast if you do T16 - Mapping
Upgrade your rings into better ones, drop the quiver and get a rare one with %projectile speed / %attack speed / %damage with bow attacks and some flat dps
you can also drop some notes and go into a cluster jewel and you should get some more levels
