BG6 issue with engines

Hello all.

I have a 1996 Legacy OBW Auto. I got the car as a gift with a dead ej25d in it. I used my engine i had in my 98 OBW for my 96 OBW. The 98 was missing paperwork and had holes in the roof from the runners. I had just bought a jdm engine from a shop and installed it. This is the second engine from the shop and the headgaskets went out on it with in 2 1/2 months. The first engine was composite material headgaskets, the second was mls. I have had 3 running ej25d engines in total. The first one in my 98 i bought with an over heating problem but was able to burp it and make it last for about a year or so. The other 2 not even 3 months. I have been looking into to swaps to do. As of right now i want something that will bolt into place of the ej25d and be able to get me from a to b with out issue. I have read that the ej20d/e will swap in with minimal work. Also do they have the same headgasket issue as the ej25d. Thanks on any input.