Edward – this FAQ applies to you, I believe
I live in a neighbouring EU country and commute to Austria for work, what will I have to do?
So you would have no problem continuing as a Grenzgänger between Bavaria and Austria, however your WA rights are in Germany, and can’t be transferred to Austria in the same way as was possible prior to the end of the transition period.