Well, I hope you don't mind, Grub, that I post my update here now.
This is a Long Red Habanero which I overwintered. It has been given me some fruit for the last 2 months, but is now really looking good. The first few fruit only had a little heat kick, but the last ones were quite hot. Must taste the current ones.
This is a Yellow Habanero. Overwintered, too. These are the first two ripe fruit. It took them ages to change from green to orange/yellow. Haven't tasted them yet.