You could try a little extra stropping, I go 25-linen, 50-leather. Also, razor burn is almost always a sign of too much pressure, ATG requires a very light touch. I'm not familiar with the soap you're using at the end but maybe withdraw that and replace with an Alum block, see if that's better. Having given you three variables, I should say, it's normally best to concentrate on one of them at a time, introduce too many and you're never sure what's doing what. If you eventually have to ditch the ATG pass, don't feel too bad about it, many don't use it (or even see the need) and you can always reintroduce it into your routine at a later date if you want. Hope this helps and good luck.