Yeah he does seem to be sticking around, so I'm probably going to wait even longer. I wouldn't mind waiting even until another version is released from Episode VIII, even if that version is better. I tend to be more of a completionist collector than getting what the best version is and my full sets from a particular film tend to be from the first film in the series, since they tend to be the most iconic. Even though my favorite SW film is ESB, for instance, my main full SW set is based on the ANH line, with merely other figures from other OT films sprinkled in (DX07 Bespin Luke, maybe a Yoda, RotJ Luke [if he gets released]). Same will apply with this current trilogy.
When it comes to buying figures, I see it as being three scenarios: When I PO a figure, it's because I know that it's a figure I without a doubt want in my collection, so it's worth at least retail to me. If it gets discounted later on, I have no regrets having paid retail price for it because it was worth at least retail price to me. Some other figures (such as TFA Finn) I'd like to have, but they're not worth retail to me to have in my collection. If I can get them at a discounted price I'll go for it, but if I miss out on it and it climbs in value, it's not a big deal to me because it wasn't worth retail to me in the first place. Then there are figures on the secondary market that I want, but I'll only pay up to a certain price for. I really wanted a DX07 Bespin Luke last winter and my ceiling price for it was $500. Fortunately, I was able to secure the regular version (the EX Vader helmet accessory wasn't important to me) at that price.