FP4+ is an awesome film but if its Tri-X you've been using HP5+ would be a more natural "replacement" if you're worried about Tri-X maybe going away.