Sounds to me like you need to choose which fish you want. If the JD is bigger than the Oscar...the JD will win any scrap. Of course, it sounds like it already has.

Oscars aren't, necessarily, always aggressive. Honestly, I'm not sure that mine could handle a huge fight now, since he hasn't had to fight for anything in his tank.
a 29 is too small for both fish. An Oscar requires a 55 at the absolute minimum. I had mine in a 55, and he wasn't happy in there. I put him in a 75, and he is MUCH happier.