No one knows or can anticipate the situation as it might be in October.
No one knows exactly when any new "guidelines" will be published.
Your arrangements were made after June 16, when DJT made his announcement about what he would like to have happen? It was only an announcement; as yet nothing new has been implemented.
The best you can do is to carry on under the old rules until new ones are published, reviewed and put into law.
The "Support for the Cuban People" category may serve you better than the "P2P" one which is sure to go away, unless "Support" is redefined or further defined under any new guidelines..