non-parametric tests and post-hoc analysis

#1
Hi.
I have the following problem:
I have a set of data coming from 5 different ventilators, tested in a bench study.
Different variables (insp time, exp time, insp flow, exp flow, insp pressure, exp pressure) were measured 5 times from each ventilator under 4 different condition (a.baseline, b.leaks, c.increased resistance, d.increased resistance and leaks)
My endpoints are:
1)show (for each dependent variable) if there are differences between different condition
2)show (for each dependent variable) if there are differences between different ventilators
Due to small number of measures and problems with normality and homogeneity of variance assumption, I would go with non-parametric tests.
My idea was to use Friedman test for point 1) (with Wilcoxon signed rank test with Bonferroni correction as post-hoc analysis); and Kruskal Wallis for point 2) (with Wilacoxon and Bonferrroni correction for post-hoc analysis).
Any suggestion?

Thanks
[/FONT]