Just caught up on this thread. Some seriously excellent work here!
I can assist with Aero testing should you choose. The subject is far too expansive to put into one post here, but if you ping me at abracabratby@yahoo.com and we can discuss. The type of testing is really going to be dependent on your budget and needs.
CFD is the most obvious choice, but not all CFD is created equal, everything from boundary conditions to the type of cores you run the solver on all have an effect on the results.
Windtunnels are tricky for streamliners because all the facilities that you would want to test at (i.e. full moving ground) are not capable of positioning the wheel pads at the narrow tracks and long wheelbases that you typically run. That leaves fixed ground facilities that can leave big question marks on the results.
Anyhow, message me if you like.
James