Welcome. I would do 2 if the BF2 was already something you were planning for anyway, especially if you can return the Sanskrit. You’ll be happier long-term.
2 or 3 may or may not allow you to avoid 1, but I would chase the better source equipment/synergies rather than try to appease one particular headphone. My philosophy.
Not sure if you’ve seen this thread comparing the RNHP with the G111, but you should give it a read if only just to get a bit of perspective between those two.