Alright so I did the same thing and just got mine too and it came with 5.4.0 too, I set up the dns to block nintendo updates and was able top get hbc up and running.
here's the thing...
I can't for the life of me figure out how to link my nnid at all. It says I need to be on the current fw...