Sometimes adding things does not help... we need to go back to basics and remove stuff.
First, your test is way too high... at 1500, man I feel bat shit crazy on that high of a T for too long... ask me how I know! And no shit you aromatize, man at that level of T any one aromatizes a lot... lol...