A friend of mine bought the Realforce orange keycap set from EK and he was able to outfit all the keys of his HHKB2. Not sure what he swapped for the right shift bar, but which ever key it was, the profile seemed to fit as well. I think he said it was one of the Capslock keys, he had no idea because it's non-printed.
The KBC poker has a more 'ideal' layout for non-programmers. I'd get Pokers if I didn't like Topre switches so much lol, but the HHKB is just too cute. And I code, trying to learn VIM more--where HHKB really shines.